alina
/
Pebble-Time-Watchface-Squared-4.0
1
1
Fork 0
Code Releases Activity

bugfixes for Aplite related to high contrast mode

squarelines 4.7
Alina Marquardt 2016-01-16 23:36:12 +01:00
parent 1388670ce7
commit da68da4fe2
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
appinfo.json
View File

@ -36,7 +36,7 @@
"chalk" "chalk"
], ],
"uuid": "793bab03-9464-48a2-b63f-3f779c473db8", "uuid": "793bab03-9464-48a2-b63f-3f779c473db8",
"versionLabel": "4.6", "versionLabel": "4.7",
"watchapp": { "watchapp": {
"watchface": true "watchface": true
} }

8
src/squared.c
View File

@ -59,7 +59,7 @@ enum {
#define US_DATE (!curPrefs.eu_date) // true == MM/DD, false == DD/MM #define US_DATE (!curPrefs.eu_date) // true == MM/DD, false == DD/MM
#define CENTER_DATE (curPrefs.center) #define CENTER_DATE (curPrefs.center)
#define DISCONNECT_VIBRATION (curPrefs.btvibe) #define DISCONNECT_VIBRATION (curPrefs.btvibe)
#define CONTRAST_WHILE_CHARGING (curPrefs.contrast) #define CONTRAST_WHILE_CHARGING PBL_IF_BW_ELSE(false, (curPrefs.contrast))
#define LIGHT_WHILE_CHARGING (curPrefs.backlight) #define LIGHT_WHILE_CHARGING (curPrefs.backlight)
#define DISABLE_ANIM (curPrefs.nightsaver) #define DISABLE_ANIM (curPrefs.nightsaver)
#define DISABLE_ANIM_START_TIME (curPrefs.ns_start) #define DISABLE_ANIM_START_TIME (curPrefs.ns_start)
@ -662,6 +662,7 @@ static void teardownUI() {
} }
static void battery_handler(BatteryChargeState charge_state) { static void battery_handler(BatteryChargeState charge_state) {
#if defined(PBL_COLOR)
if (CONTRAST_WHILE_CHARGING) { if (CONTRAST_WHILE_CHARGING) {
previous_contrastmode = contrastmode; previous_contrastmode = contrastmode;
if (charge_state.is_plugged) { if (charge_state.is_plugged) {
@ -674,6 +675,7 @@ static void battery_handler(BatteryChargeState charge_state) {
setupUI(); setupUI();
} }
} }
#endif
if (LIGHT_WHILE_CHARGING) { if (LIGHT_WHILE_CHARGING) {
if (charge_state.is_plugged) { if (charge_state.is_plugged) {
light_enable(true); light_enable(true);
@ -759,6 +761,7 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
} }
persist_write_data(PREFERENCES_KEY, &curPrefs, sizeof(curPrefs)); persist_write_data(PREFERENCES_KEY, &curPrefs, sizeof(curPrefs));
vibes_short_pulse(); vibes_short_pulse();
#if defined(PBL_COLOR)
if (curPrefs.contrast == false) { if (curPrefs.contrast == false) {
contrastmode = false; contrastmode = false;
previous_contrastmode = false; previous_contrastmode = false;
@ -769,6 +772,7 @@ static void in_received_handler(DictionaryIterator *iter, void *context) {
previous_contrastmode = true; previous_contrastmode = true;
} }
} }
#endif
if (curPrefs.backlight == false) { if (curPrefs.backlight == false) {
light_enable(false); light_enable(false);
} else { } else {
@ -832,12 +836,14 @@ static void init() {
BatteryChargeState charge_state = battery_state_service_peek(); BatteryChargeState charge_state = battery_state_service_peek();
if (charge_state.is_plugged) { if (charge_state.is_plugged) {
#if defined(PBL_COLOR)
if (CONTRAST_WHILE_CHARGING) { if (CONTRAST_WHILE_CHARGING) {
previous_contrastmode = true; previous_contrastmode = true;
contrastmode = true; contrastmode = true;
teardownUI(); teardownUI();
setupUI(); setupUI();
} }
#endif
if (LIGHT_WHILE_CHARGING) { if (LIGHT_WHILE_CHARGING) {
light_enable(true); light_enable(true);
} }