From d9e36d304a3aa8e808030f06bb43e6758fdf245b Mon Sep 17 00:00:00 2001
From: JumpMaster <kevin@cooper.uk.com>
Date: Wed, 27 May 2015 08:54:53 +0100
Subject: [PATCH] Name changed to PebbAuth.

---
 appinfo.json            |  6 +++---
 src/dod_window.c        | 20 ++++++++++++++------
 src/dod_window.h        |  2 +-
 src/js/pebble-js-app.js |  2 +-
 src/main.c              |  2 +-
 src/main.h              |  4 ++--
 src/select_window.c     |  2 +-
 7 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/appinfo.json b/appinfo.json
index bfe27b1..5a3aea4 100644
--- a/appinfo.json
+++ b/appinfo.json
@@ -16,7 +16,7 @@
         "configurable"
     ],
     "companyName": "Kevin Cooper",
-    "longName": "PebbleAuth",
+    "longName": "PebbAuth",
     "projectType": "native",
     "resources": {
         "media": [
@@ -81,13 +81,13 @@
         ]
     },
     "sdkVersion": "3",
-    "shortName": "PebbleAuth",
+    "shortName": "PebbAuth",
     "targetPlatforms": [
         "aplite",
         "basalt"
     ],
     "uuid": "1f4d9835-3b9a-4ddd-907e-41a25d06f19c",
-    "versionLabel": "2.1",
+    "versionLabel": "2.2",
     "watchapp": {
         "watchface": false
     }
diff --git a/src/dod_window.c b/src/dod_window.c
index f189993..50df95c 100644
--- a/src/dod_window.c
+++ b/src/dod_window.c
@@ -1,3 +1,10 @@
+//
+// Copyright 2015
+// PebbAuth for the Pebble Smartwatch
+// Author: Kevin Cooper
+// https://github.com/JumpMaster/PebbleAuth
+//
+
 #include "pebble.h"
 #include "main.h"
 #include "select_window.h"
@@ -98,12 +105,13 @@ void dod_window_push(int key_id) {
 		#ifdef PBL_SDK_2
 			window_set_fullscreen(dod_main_window, true);
 		#endif
-		
-		#ifdef PBL_COLOR
-			window_set_background_color(dod_main_window, bg_color);
-		#else
-			window_set_background_color(dod_main_window, GColorWhite);
-		#endif
+			
+		window_set_background_color(dod_main_window, COLOR_FALLBACK(bg_color, GColorBlack));
+//		#ifdef PBL_COLOR
+//			window_set_background_color(dod_main_window, bg_color);
+//		#else
+//			window_set_background_color(dod_main_window, GColorWhite);
+//		#endif
 
 		window_set_window_handlers(dod_main_window, (WindowHandlers) {
 			.load = window_load,
diff --git a/src/dod_window.h b/src/dod_window.h
index 00305f7..a6673af 100644
--- a/src/dod_window.h
+++ b/src/dod_window.h
@@ -1,6 +1,6 @@
 //
 // Copyright 2015
-// PebbleAuth for the Pebble Smartwatch
+// PebbAuth for the Pebble Smartwatch
 // Author: Kevin Cooper
 // https://github.com/JumpMaster/PebbleAuth
 //
diff --git a/src/js/pebble-js-app.js b/src/js/pebble-js-app.js
index 3eb5441..e33c12d 100644
--- a/src/js/pebble-js-app.js
+++ b/src/js/pebble-js-app.js
@@ -2,7 +2,7 @@ var MAX_OTP_COUNT = 16;
 var MAX_LABEL_LENGTH = 20;
 var MAX_KEY_LENGTH = 64;
 var MAX_MESSAGE_RETRIES = 5;
-var APP_VERSION = 21;
+var APP_VERSION = 22;
 
 var otp_count = 0;
 var aplite_theme = -1;
diff --git a/src/main.c b/src/main.c
index 6e909b2..1e2627a 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1,6 +1,6 @@
 //
 // Copyright 2015
-// PebbleAuth for the Pebble Smartwatch
+// PebbAuth for the Pebble Smartwatch
 // Author: Kevin Cooper
 // https://github.com/JumpMaster/PebbleAuth
 //
diff --git a/src/main.h b/src/main.h
index 21ea624..b9e8c9d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -1,6 +1,6 @@
 //
 // Copyright 2015
-// PebbleAuth for the Pebble Smartwatch
+// PebbAuth for the Pebble Smartwatch
 // Author: Kevin Cooper
 // https://github.com/JumpMaster/PebbleAuth
 //
@@ -23,7 +23,7 @@ typedef struct {
 #define MAX_LABEL_LENGTH 21 // 20 + termination
 #define MAX_KEY_LENGTH 65 // 64 + termination
 #define MAX_COMBINED_LENGTH MAX_LABEL_LENGTH+MAX_KEY_LENGTH
-#define APP_VERSION 21
+#define APP_VERSION 22
 #define DEBUG false
 	
 #define SELECT_WINDOW_CELL_HEIGHT 30
diff --git a/src/select_window.c b/src/select_window.c
index 0f07c76..6b91ab1 100644
--- a/src/select_window.c
+++ b/src/select_window.c
@@ -1,6 +1,6 @@
 //
 // Copyright 2015
-// PebbleAuth for the Pebble Smartwatch
+// PebbAuth for the Pebble Smartwatch
 // Author: Kevin Cooper
 // https://github.com/JumpMaster/PebbleAuth
 //