Left-sidebar option works again

freakified · Sep 22, 2016 · d1e970a · d1e970a
1 parent 9929332
commit d1e970a
Show file tree

Hide file tree

Showing 54 changed files with 34 additions and 23 deletions.
diff --git a/.gitignore b/.gitignore
diff --git a/LICENSE b/LICENSE
diff --git a/README.md b/README.md
diff --git a/other/Consolas.svg b/other/Consolas.svg
diff --git a/other/LECO_1976-Regular.1.svg b/other/LECO_1976-Regular.1.svg
diff --git a/other/avenir-next-regular.svg b/other/avenir-next-regular.svg
diff --git a/other/avenirnext-demibold.svg b/other/avenirnext-demibold.svg
diff --git a/other/david-libre-bold.svg b/other/david-libre-bold.svg
diff --git a/package.json b/package.json
diff --git a/project_banner.png b/project_banner.png
diff --git a/resources/data/BATTERY_BG.pdc b/resources/data/BATTERY_BG.pdc
diff --git a/resources/data/BATTERY_CHARGE.pdc b/resources/data/BATTERY_CHARGE.pdc
diff --git a/resources/data/CLEAR_DAY.pdc b/resources/data/CLEAR_DAY.pdc
diff --git a/resources/data/CLEAR_NIGHT.pdc b/resources/data/CLEAR_NIGHT.pdc
diff --git a/resources/data/CLOUDY_DAY.pdc b/resources/data/CLOUDY_DAY.pdc
diff --git a/resources/data/DATE_BG.pdc b/resources/data/DATE_BG.pdc
diff --git a/resources/data/DISCONNECTED.pdc b/resources/data/DISCONNECTED.pdc
diff --git a/resources/data/HEALTH_SLEEP.pdc b/resources/data/HEALTH_SLEEP.pdc
diff --git a/resources/data/HEALTH_SLEEP_LG.pdc b/resources/data/HEALTH_SLEEP_LG.pdc
diff --git a/resources/data/HEALTH_SLEEP_SM.pdc b/resources/data/HEALTH_SLEEP_SM.pdc
diff --git a/resources/data/HEALTH_STEPS.pdc b/resources/data/HEALTH_STEPS.pdc
diff --git a/resources/data/HEAVY_RAIN.pdc b/resources/data/HEAVY_RAIN.pdc
diff --git a/resources/data/HEAVY_SNOW.pdc b/resources/data/HEAVY_SNOW.pdc
diff --git a/resources/data/LIGHT_RAIN.pdc b/resources/data/LIGHT_RAIN.pdc
diff --git a/resources/data/LIGHT_SNOW.pdc b/resources/data/LIGHT_SNOW.pdc
diff --git a/resources/data/PARTLY_CLOUDY.pdc b/resources/data/PARTLY_CLOUDY.pdc
diff --git a/resources/data/PARTLY_CLOUDY_NIGHT.pdc b/resources/data/PARTLY_CLOUDY_NIGHT.pdc
diff --git a/resources/data/RAINING_AND_SNOWING.pdc b/resources/data/RAINING_AND_SNOWING.pdc
diff --git a/resources/data/THUNDERSTORM.pdc b/resources/data/THUNDERSTORM.pdc
diff --git a/resources/data/WEATHER_GENERIC.pdc b/resources/data/WEATHER_GENERIC.pdc
diff --git a/resources/fonts/AvenirNextDemiBold.ffont b/resources/fonts/AvenirNextDemiBold.ffont
diff --git a/resources/fonts/AvenirNextRegular.ffont b/resources/fonts/AvenirNextRegular.ffont
diff --git a/resources/fonts/LECO1976-Regular.ffont b/resources/fonts/LECO1976-Regular.ffont
diff --git a/resources/images/menuicon~bw.png b/resources/images/menuicon~bw.png
diff --git a/resources/images/menuicon~color.png b/resources/images/menuicon~color.png
diff --git a/resources/images/menuicon~color~round.png b/resources/images/menuicon~color~round.png
diff --git a/src/c/clock_area.c b/src/c/clock_area.c
@@ -12,11 +12,15 @@ Layer* clock_area_layer;
 FFont* hours_font;
 FFont* minutes_font;
 
-// just allocate all the fonts at startup because i'm lazy
+// just allocate all the fonts at startup because i don't feel like
+// dealing with allocating and deallocating things
 FFont* avenir;
 FFont* avenir_bold;
 FFont* leco;
 
+GRect screen_rect;
+
+// "private" functions
 void update_fonts() {
   switch(globalSettings.clockFontId) {
     case FONT_SETTING_DEFAULT:
@@ -42,7 +46,6 @@ void update_fonts() {
   }
 }
 
-// "private" functions
 void update_clock_area_layer(Layer *l, GContext* ctx) {
   // check layer bounds
   GRect bounds = layer_get_unobstructed_bounds(l);
@@ -54,23 +57,30 @@ void update_clock_area_layer(Layer *l, GContext* ctx) {
   fctx_set_color_bias(&fctx, 0);
   fctx_set_fill_color(&fctx, globalSettings.timeColor);
 
-  // draw the time
+
+  // calculate font size
   int font_size = 4 * bounds.size.h / 7;
 
-  // avenir
+  // avenir + avenir bold metrics
   int v_padding = bounds.size.h / 16;
   int h_adjust = 0;
 
-  // alternate params for LECO
+  // alternate metrics for LECO
   if(globalSettings.clockFontId == FONT_SETTING_LECO) {
     v_padding = bounds.size.h / 13;
     h_adjust = -2;
 
+    // leco looks awful with antialiasing
     #ifdef PBL_COLOR
       fctx_enable_aa(false);
     #endif
   }
 
+  // if the sidebar is on the other side, modify offset to accomodate
+  if(globalSettings.sidebarOnLeft) {
+    h_adjust += 30;
+  }
+
   FPoint time_pos;
   fctx_begin_fill(&fctx);
   fctx_set_text_size(&fctx, hours_font, font_size);
@@ -91,14 +101,15 @@ void update_clock_area_layer(Layer *l, GContext* ctx) {
   fctx_deinit_context(&fctx);
 }
 
+
 void ClockArea_init(Window* window) {
-  // init the clock area layer
-  GRect screen_rect = layer_get_bounds(window_get_root_layer(window));
-  GRect bounds;
+  // record the screen size, since we NEVER GET IT AGAIN
+  screen_rect = layer_get_bounds(window_get_root_layer(window));
 
-  // TODO: add left-side-sidebar support
+  GRect bounds;
   bounds = GRect(0, 0, screen_rect.size.w - 30, screen_rect.size.h);
 
+  // init the clock area layer
   clock_area_layer = layer_create(bounds);
   layer_add_child(window_get_root_layer(window), clock_area_layer);
   layer_set_update_proc(clock_area_layer, update_clock_area_layer);
@@ -121,8 +132,11 @@ void ClockArea_deinit() {
 }
 
 void ClockArea_redraw() {
+
   // check if the fonts need to be switched
   update_fonts();
+  // check if we need to move the frame
+
 
   layer_mark_dirty(clock_area_layer);  
 }

diff --git a/src/c/clock_area.h b/src/c/clock_area.h
diff --git a/src/c/languages.c b/src/c/languages.c
diff --git a/src/c/languages.h b/src/c/languages.h
diff --git a/src/c/main.c b/src/c/main.c
@@ -66,11 +66,11 @@ void redrawScreen() {
 static void main_window_load(Window *window) {
   window_set_background_color(window, globalSettings.timeBgColor);
 
-  ClockArea_init(window);
-
   // create the sidebar
   Sidebar_init(window);
 
+  ClockArea_init(window);
+
   // Make sure the time is displayed from the start
   redrawScreen();
   update_clock();

diff --git a/src/c/messaging.h b/src/c/messaging.h
diff --git a/src/c/sidebar.c b/src/c/sidebar.c
@@ -8,7 +8,8 @@
 #include "sidebar_widgets.h"
 
 #define V_PADDING 8
-#define SCREEN_HEIGHT 168
+
+GRect screen_rect;
 
 // "private" functions
 // layer update callbacks
@@ -30,18 +31,18 @@ Layer* sidebarLayer;
 
 void Sidebar_init(Window* window) {
   // init the sidebar layer
-  GRect screenRect = layer_get_bounds(window_get_root_layer(window));
+  screen_rect = layer_get_bounds(window_get_root_layer(window));
   GRect bounds;
 
   #ifdef PBL_ROUND
     GRect bounds2;
-    bounds = GRect(0, 0, 40, screenRect.size.h);
-    bounds2 = GRect(screenRect.size.w - 40, 0, 40, screenRect.size.h);
+    bounds = GRect(0, 0, 40, screen_rect.size.h);
+    bounds2 = GRect(screen_rect.size.w - 40, 0, 40, screen_rect.size.h);
   #else
     if(!globalSettings.sidebarOnLeft) {
-      bounds = GRect(114, 0, 30, screenRect.size.h);
+      bounds = GRect(114, 0, 30, screen_rect.size.h);
     } else {
-      bounds = GRect(0, 0, 30, screenRect.size.h);
+      bounds = GRect(0, 0, 30, screen_rect.size.h);
     }
   #endif
 
@@ -74,9 +75,9 @@ void Sidebar_redraw() {
   #ifndef PBL_ROUND
     // reposition the sidebar if needed
     if(globalSettings.sidebarOnLeft) {
-      layer_set_frame(sidebarLayer, GRect(0, 0, 30, SCREEN_HEIGHT));
+      layer_set_frame(sidebarLayer, GRect(0, 0, 30, screen_rect.size.h));
     } else {
-      layer_set_frame(sidebarLayer, GRect(114, 0, 30, SCREEN_HEIGHT));
+      layer_set_frame(sidebarLayer, GRect(114, 0, 30, screen_rect.size.h));
     }
   #endif
 
@@ -219,10 +220,6 @@ void drawRoundSidebar(GContext* ctx, GRect bgBounds, SidebarWidgetType widgetTyp
 }
 #endif
 
-
-
-
-
 void updateRectSidebar(Layer *l, GContext* ctx) {
   GRect bounds = layer_get_unobstructed_bounds(l);
 

diff --git a/src/c/sidebar.h b/src/c/sidebar.h
diff --git a/src/c/sidebar_widgets.h b/src/c/sidebar_widgets.h
diff --git a/src/c/util.c b/src/c/util.c
diff --git a/src/c/weather.c b/src/c/weather.c
diff --git a/src/c/weather.h b/src/c/weather.h
diff --git a/src/pkjs/secrets_example.js b/src/pkjs/secrets_example.js
diff --git a/src/pkjs/weather.js b/src/pkjs/weather.js
diff --git a/src/pkjs/weather_owm.js b/src/pkjs/weather_owm.js
diff --git a/src/pkjs/weather_wunderground.js b/src/pkjs/weather_wunderground.js
diff --git a/tools/localDates.py b/tools/localDates.py
diff --git a/wscript b/wscript