alina/Pebble-Time-Watchface-Super-Simple
1
0
Fork 0
mirror of https://github.com/alinanorakari/Pebble-Time-Watchface-Super-Simple.git synced 2025-12-14 15:45:22 +01:00
Code Releases Activity

Compare commits

base: alina:1.4
Branches Tags
alina:master
alina:1.7 alina:1.6 alina:1.5 alina:1.4 alina:1.3 alina:1.0 alina:0.9 alina:1.1 alina:1.2
..
compare: alina:1.6
Branches Tags
alina:master
alina:1.7 alina:1.6 alina:1.5 alina:1.4 alina:1.3 alina:1.0 alina:0.9 alina:1.1 alina:1.2

3 Commits
1.4 ... 1.6

Author SHA1 Message Date
Peter Marquardt
18223442d0 made changes release ready 2015-11-25 20:18:30 +01:00
Peter Marquardt
9d7b3a945a fixed boolean in AppMessage bug, moved ticks 2015-11-25 20:02:53 +01:00
Peter Marquardt
4e298171ef fixed a bug on Android keeping ticks rectangular 2015-11-24 23:23:27 +01:00
3 changed files with 21 additions and 19 deletions
Expand all files Collapse all files

2
appinfo.json
View File

@@ -25,7 +25,7 @@
"chalk"
],
"uuid": "ceeae81b-6b50-43b6-8bbb-6d6f6eb62b69",
"versionLabel": "1.4",
"versionLabel": "1.6",
"watchapp": {
"watchface": true
}

6
src/js/pebble-js-app.js
View File

@@ -7,7 +7,7 @@ Pebble.addEventListener('showConfiguration', function() {
if(Pebble.getActiveWatchInfo) {
watch = Pebble.getActiveWatchInfo();
}
var url='http://pebble.lastfuture.de/config/supersimple14/';
var url='http://pebble.lastfuture.de/config/supersimple15/';
if (watch.platform != "chalk") {
url += "?rect=true";
}
@@ -24,10 +24,10 @@ Pebble.addEventListener('webviewclosed', function(e) {
colorm: parseInt(configData.colorm, 16),
colorh: parseInt(configData.colorh, 16),
colorp: parseInt(configData.colorp, 16),
shadows: configData.shadows === true,
shadows: 0+(configData.shadows === 'true'),
ticks: configData.ticks,
colort: parseInt(configData.colort, 16),
rectticks: configData.rectticks === true
rectticks: 0+(configData.rectticks === 'true')
}, function() {
console.log('Send successful!');
}, function() {

32
src/main.c
View File

@@ -87,7 +87,7 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
persist_write_int(KEY_PEG_COLOR, colorp);
gcolorp = GColorFromHEX(colorp);
}
if(shadows_t && shadows_t->value->int32 > 0) {
if(shadows_t && shadows_t->value->int8 > 0) {
persist_write_bool(KEY_SHADOWS, true);
shadows = true;
} else {
@@ -103,7 +103,7 @@ static void inbox_received_handler(DictionaryIterator *iter, void *context) {
persist_write_int(KEY_TICK_COLOR, colort);
gcolort = GColorFromHEX(colort);
}
if(rectticks_t && rectticks_t->value->int32 > 0) {
if(rectticks_t && rectticks_t->value->int8 > 0) {
persist_write_bool(KEY_RECT_TICKS, true);
rectticks = true;
} else {
@@ -220,24 +220,26 @@ static void update_proc(Layer *layer, GContext *ctx) {
#if defined(PBL_RECT)
if (rectticks) {
int dist_v = 41;
int dist_h = 44;
int dist_h = 46;
int halfwidth = (bounds.size.w/2)-1;
int halfheight = (bounds.size.h/2)-1;
switch (ticks) {
case 12:
graphics_fill_circle(ctx, GPoint((bounds.size.w/2)+dist_h, 4), TICK_RADIUS/2); // 1
graphics_fill_circle(ctx, GPoint((bounds.size.w/2)-dist_h, 4), TICK_RADIUS/2); // 11
graphics_fill_circle(ctx, GPoint((bounds.size.w/2)+dist_h, (bounds.size.h-5)), TICK_RADIUS/2); // 5
graphics_fill_circle(ctx, GPoint((bounds.size.w/2)-dist_h, (bounds.size.h-5)), TICK_RADIUS/2); // 7
graphics_fill_circle(ctx, GPoint((bounds.size.w-5), (bounds.size.h/2)-dist_v), TICK_RADIUS/2); // 2
graphics_fill_circle(ctx, GPoint((bounds.size.w-5), (bounds.size.h/2)+dist_v), TICK_RADIUS/2); // 4
graphics_fill_circle(ctx, GPoint(4, (bounds.size.h/2)-dist_v), TICK_RADIUS/2); // 10
graphics_fill_circle(ctx, GPoint(4, (bounds.size.h/2)+dist_v), TICK_RADIUS/2); // 8
graphics_fill_circle(ctx, GPoint(halfwidth+dist_h, 4), TICK_RADIUS/2); // 1
graphics_fill_circle(ctx, GPoint(halfwidth-dist_h, 4), TICK_RADIUS/2); // 11
graphics_fill_circle(ctx, GPoint(halfwidth+dist_h, (bounds.size.h-5)), TICK_RADIUS/2); // 5
graphics_fill_circle(ctx, GPoint(halfwidth-dist_h, (bounds.size.h-5)), TICK_RADIUS/2); // 7
graphics_fill_circle(ctx, GPoint((bounds.size.w-5), halfheight-dist_v), TICK_RADIUS/2); // 2
graphics_fill_circle(ctx, GPoint((bounds.size.w-5), halfheight+dist_v), TICK_RADIUS/2); // 4
graphics_fill_circle(ctx, GPoint(4, halfheight-dist_v), TICK_RADIUS/2); // 10
graphics_fill_circle(ctx, GPoint(4, halfheight+dist_v), TICK_RADIUS/2); // 8
case 4:
graphics_fill_circle(ctx, GPoint((bounds.size.w/2), (bounds.size.h-3)), TICK_RADIUS); // 6
graphics_fill_circle(ctx, GPoint((bounds.size.w-3), (bounds.size.h/2)), TICK_RADIUS); // 3
graphics_fill_circle(ctx, GPoint(2, (bounds.size.h/2)), TICK_RADIUS); // 9
graphics_fill_circle(ctx, GPoint(halfwidth, (bounds.size.h-3)), TICK_RADIUS); // 6
graphics_fill_circle(ctx, GPoint((bounds.size.w-3), halfheight), TICK_RADIUS); // 3
graphics_fill_circle(ctx, GPoint(2, halfheight), TICK_RADIUS); // 9
case 1:
default:
graphics_fill_circle(ctx, GPoint((bounds.size.w/2), 2), TICK_RADIUS); // 12
graphics_fill_circle(ctx, GPoint(halfwidth, 2), TICK_RADIUS); // 12
break;
}
} else {