Merge branch 'master' of http://github.com/ClusterM/pebble-mario

8 files changed, 10 insertions, 10 deletions

diff --git a/appinfo.json b/appinfo.json
index f2baf3f..c830aad 100644
--- a/appinfo.json
+++ b/appinfo.json
@@ -15,8 +15,8 @@
     "resources": {
         "media": [
             {
-                "file": "images/battery-charging.png",
-                "name": "IMAGE_BATTERY_CHARGING",
+                "file": "images/watch_icon.png",
+                "name": "IMAGE_WATCH_ICON",
                 "type": "png"
             },
             {
@@ -25,8 +25,8 @@
                 "type": "png"
             },
             {
-                "file": "images/watch_icon.png",
-                "name": "IMAGE_WATCH_ICON",
+                "file": "images/battery-charging.png",
+                "name": "IMAGE_BATTERY_CHARGING",
                 "type": "png"
             },
             {
diff --git a/resources/images/battery-charging.png b/resources/images/battery-charging.png
index 21b55c5..3350309 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 aa3925a..3c91e15 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 7d8c39d..f581294 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 9046597..31f7300 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 8f059f4..abb6fe2 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 0155ad0..bcdf0f9 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 e1c9b74..996df64 100644
--- a/src/pebble-mario.c
+++ b/src/pebble-mario.c
@@ -15,8 +15,8 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
-// You may contact the author of original watchface at denis@ddenis.info
-// Author of color mod for Pebble Time: clusterrr@clusterrr.com
+// You may contact the author of the original watchface at denis@ddenis.info
+// Author of the color mod for Pebble Time: clusterrr@clusterrr.com
 //
 
 #include <pebble.h>
@@ -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(8, 2, phone_battery_level, 5), 0, GCornerNone);
+    graphics_fill_rect(ctx, GRect(9, 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(8, 2, charge_state.charge_percent / 10, 5), 0, GCornerNone);
+    graphics_fill_rect(ctx, GRect(9, 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(120, 5, 21, 9);
-  phone_battery_rect = GRect(3, 5, 21, 9);
+  battery_rect = GRect(119, 5, 22, 9);
+  phone_battery_rect = GRect(3, 5, 22, 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));