Some design fixes

8 files changed, 15 insertions, 15 deletions

diff --git a/appinfo.json b/appinfo.json
index b11e825..f2baf3f 100644
--- a/appinfo.json
+++ b/appinfo.json
@@ -15,8 +15,8 @@
     "resources": {
         "media": [
             {
-                "file": "images/no-phone.png",
-                "name": "IMAGE_NO_PHONE",
+                "file": "images/battery-charging.png",
+                "name": "IMAGE_BATTERY_CHARGING",
                 "type": "png"
             },
             {
@@ -25,18 +25,18 @@
                 "type": "png"
             },
             {
-                "file": "images/mario_bg_night_color.png",
-                "name": "IMAGE_BACKGROUND_NIGHT",
+                "file": "images/watch_icon.png",
+                "name": "IMAGE_WATCH_ICON",
                 "type": "png"
             },
             {
-                "file": "images/battery-charging.png",
-                "name": "IMAGE_BATTERY_CHARGING",
+                "file": "images/no-phone.png",
+                "name": "IMAGE_NO_PHONE",
                 "type": "png"
             },
             {
-                "file": "images/watch_icon.png",
-                "name": "IMAGE_WATCH_ICON",
+                "file": "images/mario_bg_night_color.png",
+                "name": "IMAGE_BACKGROUND_NIGHT",
                 "type": "png"
             },
             {
diff --git a/resources/images/battery-charging.png b/resources/images/battery-charging.png
index f37144e..21b55c5 100644
--- a/resources/images/battery-charging.png
+++ b/resources/images/battery-charging.png
diff --git a/resources/images/battery-charging~color.png b/resources/images/battery-charging~color.png
index 54268cc..aa3925a 100644
--- a/resources/images/battery-charging~color.png
+++ b/resources/images/battery-charging~color.png
diff --git a/resources/images/phone_icon.png b/resources/images/phone_icon.png
index aa1def8..7d8c39d 100644
--- a/resources/images/phone_icon.png
+++ b/resources/images/phone_icon.png
diff --git a/resources/images/phone_icon~color.png b/resources/images/phone_icon~color.png
index 634515b..9046597 100644
--- a/resources/images/phone_icon~color.png
+++ b/resources/images/phone_icon~color.png
diff --git a/resources/images/watch_icon.png b/resources/images/watch_icon.png
index 051fbb3..8f059f4 100644
--- a/resources/images/watch_icon.png
+++ b/resources/images/watch_icon.png
diff --git a/resources/images/watch_icon~color.png b/resources/images/watch_icon~color.png
index 0e0375f..0155ad0 100644
--- a/resources/images/watch_icon~color.png
+++ b/resources/images/watch_icon~color.png
diff --git a/src/pebble-mario.c b/src/pebble-mario.c
index 0643931..e1c9b74 100644
--- a/src/pebble-mario.c
+++ b/src/pebble-mario.c
@@ -248,7 +248,7 @@ void ground_update_callback(Layer *layer, GContext *ctx)
   graphics_draw_bitmap_in_rect(ctx, background_day_bmp, layer_bounds);
 
   layer_bounds.origin.y = 5;
-  layer_bounds.origin.x = 30;
+  layer_bounds.origin.x = 31;
 #if PBL_COLOR  
   graphics_context_set_text_color(ctx, GColorWhite);
 #else
@@ -264,12 +264,12 @@ void ground_update_callback(Layer *layer, GContext *ctx)
   to_upcase(date_text);
   graphics_draw_text(ctx, date_text, pixel_font_small, layer_bounds, GTextOverflowModeTrailingEllipsis, GTextAlignmentLeft, NULL);
 
-  layer_bounds.origin.x += 37;
+  layer_bounds.origin.x += 34;
   strftime(date_text, sizeof(date_text), "%b", tick_time);
   to_upcase(date_text);
   graphics_draw_text(ctx, date_text, pixel_font_small, layer_bounds, GTextOverflowModeTrailingEllipsis, GTextAlignmentLeft, NULL);
 
-  layer_bounds.origin.x += 31;
+  layer_bounds.origin.x += 30;
   strftime(date_text, sizeof(date_text), "%d", tick_time);
   to_upcase(date_text);
   graphics_draw_text(ctx, date_text, pixel_font_small, layer_bounds, GTextOverflowModeTrailingEllipsis, GTextAlignmentLeft, NULL);
@@ -316,7 +316,7 @@ void phone_battery_update_callback(Layer *layer, GContext *ctx)
 #else
     graphics_context_set_fill_color(ctx, GColorBlack);
 #endif
-    graphics_fill_rect(ctx, GRect(7, 2, phone_battery_level, 5), 0, GCornerNone);
+    graphics_fill_rect(ctx, GRect(8, 2, phone_battery_level, 5), 0, GCornerNone);
   }
 }
 
@@ -340,7 +340,7 @@ void battery_update_callback(Layer *layer, GContext *ctx)
 #else
       graphics_context_set_fill_color(ctx, GColorBlack);
 #endif
-    graphics_fill_rect(ctx, GRect(7, 2, charge_state.charge_percent / 10, 5), 0, GCornerNone);
+    graphics_fill_rect(ctx, GRect(8, 2, charge_state.charge_percent / 10, 5), 0, GCornerNone);
   }
 }
 
@@ -504,8 +504,8 @@ void handle_init()
 #endif
   
   background_rect = GRect(0, 0, 144, 168);
-  battery_rect = GRect(122, 5, 20, 9);
-  phone_battery_rect = GRect(2, 5, 20, 9);
+  battery_rect = GRect(120, 5, 21, 9);
+  phone_battery_rect = GRect(3, 5, 21, 9);
 
   pixel_font = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_GAMEGIRL_24));
   //pixel_font = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_EMULOGIC_24));