From 1ed68a4d418e2392444b218b2eb126bd05caa31f Mon Sep 17 00:00:00 2001
From: Neale Pickett <neale@woozle.org>
Date: Sat, 8 Oct 2016 20:41:07 -0600
Subject: [PATCH] Debug

---
 appinfo.json                    | 123 ------------------------------
 package.json                    | 131 ++++++++++++++++++++++++++++++++
 resources/images/icon.png       | Bin 973 -> 905 bytes
 src/{ => c}/main.c              |  77 ++++++++++++++-----
 src/{ => c}/settings.h          |   0
 src/{ => pkjs}/pebble-js-app.js |   0
 6 files changed, 190 insertions(+), 141 deletions(-)
 delete mode 100644 appinfo.json
 create mode 100644 package.json
 rename src/{ => c}/main.c (71%)
 rename src/{ => c}/settings.h (100%)
 rename src/{ => pkjs}/pebble-js-app.js (100%)

diff --git a/appinfo.json b/appinfo.json
deleted file mode 100644
index af4583f..0000000
--- a/appinfo.json
+++ /dev/null
@@ -1,123 +0,0 @@
-{
-    "appKeys": {
-        "color_bg": 1,
-        "color_date": 2,
-        "color_time": 3,
-        "font": 0
-    },
-    "capabilities": [
-        "configurable"
-    ],
-    "companyName": "dartcatcher@gmail.com",
-    "enableMultiJS": false,
-    "longName": "Twatch Fonts",
-    "projectType": "native",
-    "resources": {
-        "media": [
-            {
-                "file": "images/icon.png",
-                "menuIcon": true,
-                "name": "ICON",
-                "targetPlatforms": null,
-                "type": "bitmap"
-            },
-            {
-                "characterRegex": "[\uf10b]",
-                "file": "fonts/fontawesome.ttf",
-                "name": "FONT_SYMBOLS_52",
-                "targetPlatforms": null,
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9A-Za-z\u00e9\u00f4 ]",
-                "file": "fonts/Ubuntu-Regular.ttf",
-                "name": "FONT_UBUNTU_R_28",
-                "targetPlatforms": null,
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9:]",
-                "file": "fonts/Ubuntu-Bold.ttf",
-                "name": "FONT_UBUNTU_B_48",
-                "targetPlatforms": [
-                    "aplite",
-                    "basalt"
-                ],
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9:]",
-                "file": "fonts/Ubuntu-Bold.ttf",
-                "name": "FONT_UBUNTU_B_64",
-                "targetPlatforms": [
-                    "chalk"
-                ],
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9A-Za-z\u00e9\u00f4 ]",
-                "file": "fonts/Helvetica-Regular.ttf",
-                "name": "FONT_HELVETICA_R_28",
-                "targetPlatforms": null,
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9:]",
-                "file": "fonts/Helvetica-Bold.ttf",
-                "name": "FONT_HELVETICA_B_48",
-                "targetPlatforms": [
-                    "aplite",
-                    "basalt"
-                ],
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9:]",
-                "file": "fonts/Helvetica-Bold.ttf",
-                "name": "FONT_HELVETICA_B_64",
-                "targetPlatforms": [
-                    "chalk"
-                ],
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9A-Za-z\u00e9\u00f4 ]",
-                "file": "fonts/AveriaSerif-Regular.ttf",
-                "name": "FONT_AVERIA_R_28",
-                "targetPlatforms": null,
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9:]",
-                "file": "fonts/AveriaSerif-Bold.ttf",
-                "name": "FONT_AVERIA_B_48",
-                "targetPlatforms": [
-                    "aplite",
-                    "basalt"
-                ],
-                "type": "font"
-            },
-            {
-                "characterRegex": "[0-9:]",
-                "file": "fonts/AveriaSerif-Bold.ttf",
-                "name": "FONT_AVERIA_B_64",
-                "targetPlatforms": [
-                    "chalk"
-                ],
-                "type": "font"
-            }
-        ]
-    },
-    "sdkVersion": "3",
-    "shortName": "Twatch Fonts",
-    "targetPlatforms": [
-        "aplite",
-        "basalt",
-        "chalk"
-    ],
-    "uuid": "2dce4324-374b-4e5e-9b98-3275561118f3",
-    "versionLabel": "1.4",
-    "watchapp": {
-        "watchface": true
-    }
-}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..5e32c3d
--- /dev/null
+++ b/package.json
@@ -0,0 +1,131 @@
+{
+    "author": "dartcatcher@gmail.com",
+    "dependencies": {},
+    "keywords": [],
+    "name": "twatch-fonts",
+    "pebble": {
+        "capabilities": [
+            "configurable"
+        ],
+        "displayName": "Twatch Fonts",
+        "enableMultiJS": false,
+        "messageKeys": {
+            "color_bg": 1,
+            "color_date": 2,
+            "color_time": 3,
+            "font": 0
+        },
+        "projectType": "native",
+        "resources": {
+            "media": [
+                {
+                    "file": "images/icon.png",
+                    "menuIcon": true,
+                    "name": "ICON",
+                    "targetPlatforms": null,
+                    "type": "bitmap"
+                },
+                {
+                    "characterRegex": "[\uf10b]",
+                    "file": "fonts/fontawesome.ttf",
+                    "name": "FONT_SYMBOLS_52",
+                    "targetPlatforms": null,
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9A-Za-z\u00e9\u00f4 ]",
+                    "file": "fonts/Ubuntu-Regular.ttf",
+                    "name": "FONT_UBUNTU_R_28",
+                    "targetPlatforms": null,
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9:]",
+                    "file": "fonts/Ubuntu-Bold.ttf",
+                    "name": "FONT_UBUNTU_B_64",
+                    "targetPlatforms": [
+                        "chalk"
+                    ],
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9:]",
+                    "file": "fonts/Ubuntu-Bold.ttf",
+                    "name": "FONT_UBUNTU_B_48",
+                    "targetPlatforms": [
+                        "aplite",
+                        "basalt",
+                        "diorite"
+                    ],
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9A-Za-z\u00e9\u00f4 ]",
+                    "file": "fonts/Helvetica-Regular.ttf",
+                    "name": "FONT_HELVETICA_R_28",
+                    "targetPlatforms": null,
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9:]",
+                    "file": "fonts/Helvetica-Bold.ttf",
+                    "name": "FONT_HELVETICA_B_64",
+                    "targetPlatforms": [
+                        "chalk"
+                    ],
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9:]",
+                    "file": "fonts/Helvetica-Bold.ttf",
+                    "name": "FONT_HELVETICA_B_48",
+                    "targetPlatforms": [
+                        "aplite",
+                        "basalt",
+                        "diorite"
+                    ],
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9A-Za-z\u00e9\u00f4 ]",
+                    "file": "fonts/AveriaSerif-Regular.ttf",
+                    "name": "FONT_AVERIA_R_28",
+                    "targetPlatforms": null,
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9:]",
+                    "file": "fonts/AveriaSerif-Bold.ttf",
+                    "name": "FONT_AVERIA_B_64",
+                    "targetPlatforms": [
+                        "chalk"
+                    ],
+                    "type": "font"
+                },
+                {
+                    "characterRegex": "[0-9:]",
+                    "file": "fonts/AveriaSerif-Bold.ttf",
+                    "name": "FONT_AVERIA_B_48",
+                    "targetPlatforms": [
+                        "aplite",
+                        "basalt",
+                        "diorite"
+                    ],
+                    "type": "font"
+                }
+            ]
+        },
+        "sdkVersion": "3",
+        "targetPlatforms": [
+            "aplite",
+            "basalt",
+            "chalk",
+            "diorite"
+        ],
+        "uuid": "2dce4324-374b-4e5e-9b98-3275561118f3",
+        "watchapp": {
+            "watchface": true
+        }
+    },
+    "version": "1.5.0"
+}
diff --git a/resources/images/icon.png b/resources/images/icon.png
index 38745667df937045963cae21ae817b735917abf9..0ebb31154ab4d67be95dacac127b0aba2ec1d8ec 100644
GIT binary patch
delta 872
zcmV-u1DE{G2Z;wEiBL{Q4GJ0x0000DNk~Le0000P0000P2nGNE0L1BqW04^+f8YuT
z6%{(Zz~4~-00S0DL_t(Y$GuiPODjzje&%DdD@G#<im5~k5wWn6pp}ib{s4Ph@ejOW
z<qxpY-ck^41?$8*jlG3729xaW?9M*7*z8>M^<pmEd*HzCFmpbh^PDpy01$s!B>sVD
z00@GhZ!wNzkbj<_)*4DF2q6Ffe*yrnuCCDScHM^4(^CL|QVQ1Ei5=|j?&9F!0G{XN
zizM0UbQp#q!!TsG+a*a}TwHK<b(Nmyu~)YrsqgzdJ3Hg&=cls?4oH?|B*`>Q$sDtZ
z)bl)^pPw^|B4-mMd3bop<>h7e5_6Iy2_GLHDW#mq(V&Qe!b&MfDUl=ze@Ma@gHoxK
z7fuKWA%0AT@B8NG=W})efVCFZ+KCO0BS;S=WLY-cCsK}YogfHsa&qDf6k0g&JP(aV
z1D#F>B$1{mTCEmjxm@luY^_DB)q=Ga#uzjj4M-_nX5DTVaU72g<m2N5TIT>|S%zk_
z3H|l;g}1jigkgv@O|ibdf8GZ}tyV*pWj}&V2!SYy93nvwU}Iw=ugTKVl1qK?(BOZ$
zT!!!aBb^vyaCCIkH#vOYAHla?uNY%UlGa)Rpb%m#WtCDR>3e;Bov)K*wOSqGxwV!g
zowJ|x$6z47@8{p;a(QHwgR-`^My>V46952ZyWJkDMGyqIzrX)qe-@1@`nWYc>Oh*N
zL*u__Ql*rm=yyhqB94?2LWtan=Xpqy#2rf06xC|AuYZcMv$(j3t*tE=<<!&^?(Xi~
zz9dQ9h~MAe$J5hO4!$c;Pt!DI9LGb`*!O)NA0M;bZqpdkM~b4Zg9DZ%H2_3Wg!lJ%
zcbh4tpp<eMR4SD|f5^1fzb~Y3vr21?dcBU#%}q>CPeW@Bl8{A*E-WlyZf*{hN(FHo
zqup);09IC3+^ty*yf}^#MUm_7@3q|7*}?PkGm7Aa5KuESGym=F?LkWE^ycOUudlDz
z-rj~W2F4hdiBbxkP6sb9FR0h+Xf~U8czEb@c6)n^%gam5KF-dfR;xh-LBPR?JkNtt
yYADhIKCSidM}iOt!*C>hOQjOxIEMHa@2+1LrI_u`j4H<f0000<MNUMnLSTX&NS8(c

delta 941
zcmV;e15*5n2h9f|iBL{Q4GJ0x0000DNk~Le0000S0000S2nGNE0CElAl#wAYf8Pul
z4>vIl*cN>N00UY{L_t(Y$L&@<ODjPXJ+m{L-8GR!gn+3;K@qW4L@OID^e0%@iJe+l
zi}({1%#RQRTfy4&ieO=7p@jzbduR5(BJQ}G#P`hOVf8KyWIi(Y&Y5%0ECWFJ!7%W{
z@#6_azGK^VVKRy$5dA&kLI`lqf58~jV{B+>h<x7%0GynhAp0$Z!0zrY0DyB2rPRR5
zmX?;Vy1EL}G(RWi=jSO4&+{k<0t$kFeBUP`qNAfDnwXd%(=_RWVBcz%WzqirKE1uY
z={<uWAjEM@{US|MA|jGf5_NDLsF|iohlht0hGAh}<TqbiTcfeDF#=Fnf0QH%U0z<2
zVHg7??H779Tf{ln@DUM3QAGJQjIqB;I5ILq07xWBf`^9(eWyw(D5by{17mC;mi8mp
z$Dxp>DN3bMM~9sAUV$24OVqY)Y;SMt&9asyGffk%RtuizfrucbM7!Nay<Uf5nkJ^E
zrckL=3Q3ewXt&!?N+FJ8f3#XH7>1!w?E5~VDEhLfmzNg^(UEzYrntSm#pC1Sr|{q3
z-|_VHgdhkYrNs2~bOEZx#YLoP`YmV~V+g}gBW2q*W@ctO1uicyQxF7N0!flkw^X{x
z;5ZKL?CkV1@C(9Z(%9J8p#I#=X)#N#l=>q}Ip=*7Hk(ZXK;?3|f2hMoqtR2PQi_O3
zC;pBcx{I<b>$9I#QK?k=R^J_ylanNb7}$BTW+X|1`}=#iuG^zI+qQ9Waq(L=_9M*i
z#sp)m=;pbQQuaJqnIUk_HSP1v%rx1p>C8j~V+_N?!&<OOlIRVjlxQ>>1$}bPVHgJL
z^*ZL}=5+Or<KX=Ke_XFil0+Y5Wn~3dS67{Wo*0G81xQM%y)^%7Se8Ybo15giF2!+N
zAXLVKZu8IPMc&53FvRoovwo#H=i2r-=crbz1z3d;J=Z}*5JKSQ<_5E~vnZF#5JG6E
z4FK>wPdmft=qPHn8miSQq9}svx&VOj@p1h%keP85MF_)CfB!ds_X`UPxW2yD2g#rp
zj4_;@o#FNM6$b|g1tV`Zn{XTlTU%Rj90yWL?X!1xcQ`#g)x@dQYCWV|Utfo9+c-Wx
z#@^mu2OR*EF|oT+(=@?3?-|b^7DDLC8Dj{7psyrKrIMBw`~M;Quj3a~!(lve(5XBC
P0000<MNUMn143Ye51hHO

diff --git a/src/main.c b/src/c/main.c
similarity index 71%
rename from src/main.c
rename to src/c/main.c
index 26f596b..d60afa7 100644
--- a/src/main.c
+++ b/src/c/main.c
@@ -11,15 +11,17 @@ int sel_font = 0;
 uint32_t color_bg = 0x000000;
 uint32_t color_date = 0xffffff;
 uint32_t color_time = 0xffffff;
+
+#define TIME_H PBL_IF_RECT_ELSE(48, 64)
+#define DATE_H 28
+#define ICON_H 52
   
 
 static void bt_handler(bool connected) {
   bt_connected = connected;
-#ifndef PBL_ROUND
   if (! bt_connected) {
     vibes_double_pulse();
   }
-#endif
   layer_mark_dirty(main_layer);
 }
 
@@ -56,23 +58,51 @@ static void handle_minute_tick(struct tm *tick_time, TimeUnits units_changed) {
   layer_mark_dirty(main_layer);
 }
 
-static void main_window_load(Window *window) {
-  main_layer = window_get_root_layer(window);
+static void reposition(GRect bounds) {
+  int16_t bottom = bounds.origin.y + bounds.size.h;
+  int16_t margin_b = TIME_H + bounds.size.h/6;
+  int16_t margin_l = 7;
+  GRect r;
+  Layer *l;
+  
+  r.origin.x = bounds.origin.x + margin_l;
+  r.origin.y = PBL_IF_RECT_ELSE(bottom - margin_b, (bottom - TIME_H)/2 - 10);
+  r.size.w = bounds.size.w - margin_l * 2;
+  r.size.h = TIME_H * 5 / 4;
+  
+  // Time
+  l = text_layer_get_layer(s_time_layer);
+  layer_set_frame(l, r);
+  layer_mark_dirty(l);
+  
+  // Date
+  l = text_layer_get_layer(s_date_layer);
+  r.origin.y -= 26;
+  r.origin.x += 1;
+  r.size.w -= 2;
+  layer_set_frame(l, r);
+  layer_mark_dirty(l);
+  
+  // Alert
+  l = text_layer_get_layer(s_alert_layer);
+  r.origin.y = PBL_IF_RECT_ELSE(margin_l, bottom - ICON_H - margin_b);
+  layer_set_frame(l, r);
+  layer_mark_dirty(l);
+}
 
-#ifdef PBL_RECT
-  s_date_layer = text_layer_create(GRect(8, 66, 128, 100));
-  s_time_layer = text_layer_create(GRect(7, 92, 130, 76));
-  s_alert_layer = text_layer_create(GRect(110, 7, 52, 52));
-  text_layer_set_text_alignment(s_date_layer, GTextAlignmentLeft);
-  text_layer_set_text_alignment(s_time_layer, GTextAlignmentLeft);  
-#else
-  s_date_layer = text_layer_create(GRect(0, 20, 180, 100));
-  s_time_layer = text_layer_create(GRect(0, 48, 180, 76));
-  s_alert_layer = text_layer_create(GRect(0, 120, 180, 52));
-  text_layer_set_text_alignment(s_date_layer, GTextAlignmentCenter);
-  text_layer_set_text_alignment(s_time_layer, GTextAlignmentCenter);  
-  text_layer_set_text_alignment(s_alert_layer, GTextAlignmentCenter);  
-#endif
+static void main_window_load(Window *window) {
+  GRect main_frame;
+  
+  main_layer = window_get_root_layer(window);
+  main_frame = layer_get_frame(main_layer);
+
+  s_date_layer = text_layer_create(main_frame);
+  s_time_layer = text_layer_create(main_frame);
+  s_alert_layer = text_layer_create(main_frame);
+  text_layer_set_text_alignment(s_date_layer, PBL_IF_RECT_ELSE(GTextAlignmentLeft, GTextAlignmentCenter));
+  text_layer_set_text_alignment(s_time_layer, PBL_IF_RECT_ELSE(GTextAlignmentLeft, GTextAlignmentCenter));
+  text_layer_set_text_alignment(s_alert_layer, PBL_IF_RECT_ELSE(GTextAlignmentRight, GTextAlignmentCenter));
+  reposition(main_frame);
 
   text_layer_set_background_color(s_date_layer, GColorClear);
   layer_add_child(main_layer, text_layer_get_layer(s_date_layer));
@@ -109,6 +139,7 @@ static void restore() {
       break;      
     }
   }
+  APP_LOG(APP_LOG_LEVEL_DEBUG, "%x %06lx %06lx %06lx", sel_font, color_bg, color_date, color_time);
   
   text_layer_set_text_color(s_date_layer, GColorFromHEX(color_date));
   text_layer_set_text_color(s_time_layer, GColorFromHEX(color_time));
@@ -120,6 +151,10 @@ static void restore() {
   layer_mark_dirty(main_layer);
 }
 
+static void unobstructedAreaWillChange(GRect final_unobstructed_screen_area, void *context) {
+  reposition(final_unobstructed_screen_area);
+}
+
 static void in_received_handler(DictionaryIterator *rec, void *context) {
   int i;
   
@@ -149,6 +184,10 @@ static void main_window_unload(Window *window) {
 }
 
 static void init() {
+  UnobstructedAreaHandlers uahandlers = {
+    .will_change = unobstructedAreaWillChange
+  };
+
   s_main_window = window_create();
   window_set_window_handlers(s_main_window, (WindowHandlers) {
     .load = main_window_load,
@@ -165,6 +204,8 @@ static void init() {
   app_message_register_inbox_dropped(in_dropped_handler);
   app_message_open(256, 64);
   
+  unobstructed_area_service_subscribe(uahandlers, NULL);
+  
   // Prevent starting blank
   time_t now = time(NULL);
   struct tm *t = localtime(&now);
diff --git a/src/settings.h b/src/c/settings.h
similarity index 100%
rename from src/settings.h
rename to src/c/settings.h
diff --git a/src/pebble-js-app.js b/src/pkjs/pebble-js-app.js
similarity index 100%
rename from src/pebble-js-app.js
rename to src/pkjs/pebble-js-app.js