From bd8fa1a5779e6a1c9792a07ec52de2e7704ac72d Mon Sep 17 00:00:00 2001 From: Mihai Dumitrache Date: Mon, 15 Apr 2013 18:11:08 +0300 Subject: [PATCH 1/8] Romanian language files --- src/TextWatch.c | 2 +- src/{num2words-en.c => num2words-ro.c} | 62 +++++++++++++------------- src/{num2words-en.h => num2words-ro.h} | 0 3 files changed, 32 insertions(+), 32 deletions(-) rename src/{num2words-en.c => num2words-ro.c} (81%) rename src/{num2words-en.h => num2words-ro.h} (100%) diff --git a/src/TextWatch.c b/src/TextWatch.c index c879cc9..506b80a 100644 --- a/src/TextWatch.c +++ b/src/TextWatch.c @@ -2,7 +2,7 @@ #include "pebble_app.h" #include "pebble_fonts.h" -#include "num2words-en.h" +#include "num2words-ro.h" #define DEBUG 0 #define BUFFER_SIZE 44 diff --git a/src/num2words-en.c b/src/num2words-ro.c similarity index 81% rename from src/num2words-en.c rename to src/num2words-ro.c index 1d2f4c5..49fed53 100755 --- a/src/num2words-en.c +++ b/src/num2words-ro.c @@ -1,43 +1,43 @@ -#include "num2words-en.h" +#include "num2words-ro.h" #include "string.h" static const char* const ONES[] = { - "o'clock", - "one", - "two", - "three", - "four", - "five", - "six", - "seven", - "eight", - "nine" + "", + "unu", + "doua", + "trei", + "patru", + "cinci", + "sase", + "sapte", + "opt", + "noua" }; static const char* const TEENS[] ={ "", - "eleven", - "twelve", - "thirteen", - "fourteen", - "fifteen", - "sixteen", - "seventeen", - "eightteen", - "nineteen" + "unsprezece", + "doisprezece", + "treisprezece", + "patrusprezece", + "cincisprezece", + "saisprezece", + "saptesprezece", + "optsprezece", + "nouasprezece" }; static const char* const TENS[] = { "", - "ten", - "twenty", - "thirty", - "forty", - "fifty", - "sixty", - "seventy", - "eighty", - "ninety" + "zece", + "douazeci", + "treizeci", + "patruzeci", + "cincizeci", + "saizeci", + "saptezeci", + "optzeci", + "nouazeci" }; static size_t append_number(char* words, int num) { @@ -115,9 +115,9 @@ void time_to_3words(int hours, int minutes, char *line1, char *line2, char *line // Truncate long teen values if (strlen(line2) > 7) { - char *pch = strstr(line2, "teen"); + char *pch = strstr(line2, "sprezece"); if (pch) { - memcpy(line3, pch, 4); + memcpy(line3, pch, 8); pch[0] = 0; } } diff --git a/src/num2words-en.h b/src/num2words-ro.h similarity index 100% rename from src/num2words-en.h rename to src/num2words-ro.h From 5d219f97a0bfe38b7e81ca8d2161124915a65499 Mon Sep 17 00:00:00 2001 From: Mihai Dumitrache Date: Mon, 15 Apr 2013 19:00:20 +0300 Subject: [PATCH 2/8] Smalled light font added --- resources/src/fonts/gotham_light_32.ttf | Bin 0 -> 67687 bytes resources/src/resource_map.json | 10 +++--- src/TextWatch.c | 42 +++++++++++++----------- 3 files changed, 28 insertions(+), 24 deletions(-) create mode 100644 resources/src/fonts/gotham_light_32.ttf diff --git a/resources/src/fonts/gotham_light_32.ttf b/resources/src/fonts/gotham_light_32.ttf new file mode 100644 index 0000000000000000000000000000000000000000..91acda21ca6448f43fd837b1d46abcf724f85f4b GIT binary patch literal 67687 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

Eu0Q`j2U;v?GBow(RexUN!sm3qc3D9BKsXs zNtI|Y8Vr)Uh{xjq)7V9!+Z`|mTp?c&+~?24N=+|=c5p_+>8J^u6gD|c-k2>2yoZCK zu*n2A@D-D>crp@6CM>{2CYgz3V&QNiQH#Z*#HB%RAQFfK?U9hl6fhM+;Yh^kb%p|& zK+x~8c-+ZkJd(^LI81>65YGD*Ld)TB2p^|A5Dt4hp>#Ux^;R;$XeRA�p`bx#%tW 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 literal 0 HcmV?d00001 diff --git a/resources/src/resource_map.json b/resources/src/resource_map.json index 3c96a6f..cc1a2bd 100644 --- a/resources/src/resource_map.json +++ b/resources/src/resource_map.json @@ -2,10 +2,10 @@ {"friendlyVersion": "0.1", "versionDefName": "APP_RESOURCES", "media": [ - { - "type":"raw", - "defName":"DUMMY", - "file":"resource_map.json" - } + { + "type": "font", + "defName": "FONT_GOTHAM_LIGHT_32", + "file": "fonts/gotham_light_32.ttf" + } ] } diff --git a/src/TextWatch.c b/src/TextWatch.c index 506b80a..ca80f98 100644 --- a/src/TextWatch.c +++ b/src/TextWatch.c @@ -1,6 +1,7 @@ #include "pebble_os.h" #include "pebble_app.h" #include "pebble_fonts.h" +#include "resource_ids.auto.h" #include "num2words-ro.h" @@ -33,6 +34,7 @@ Line line2; Line line3; PblTm t; +GFont lightFont; static char line1Str[2][BUFFER_SIZE]; static char line2Str[2][BUFFER_SIZE]; @@ -143,25 +145,6 @@ void display_initial_time(PblTm *t) } -// Configure the first line of text -void configureBoldLayer(TextLayer *textlayer) -{ - text_layer_set_font(textlayer, fonts_get_system_font(FONT_KEY_GOTHAM_42_BOLD)); - text_layer_set_text_color(textlayer, GColorWhite); - text_layer_set_background_color(textlayer, GColorClear); - text_layer_set_text_alignment(textlayer, GTextAlignmentLeft); -} - -// Configure for the 2nd and 3rd lines -void configureLightLayer(TextLayer *textlayer) -{ - text_layer_set_font(textlayer, fonts_get_system_font(FONT_KEY_GOTHAM_42_LIGHT)); - text_layer_set_text_color(textlayer, GColorWhite); - text_layer_set_background_color(textlayer, GColorClear); - text_layer_set_text_alignment(textlayer, GTextAlignmentLeft); -} - - /** * Debug methods. For quickly debugging enable debug macro on top to transform the watchface into * a standard app and you will be able to change the time with the up and down buttons @@ -209,6 +192,24 @@ void click_config_provider(ClickConfig **config, Window *window) { #endif +// Configure the first line of text +void configureBoldLayer(TextLayer *textlayer) +{ + text_layer_set_font(textlayer, fonts_get_system_font(FONT_KEY_GOTHAM_42_BOLD)); + text_layer_set_text_color(textlayer, GColorWhite); + text_layer_set_background_color(textlayer, GColorClear); + text_layer_set_text_alignment(textlayer, GTextAlignmentLeft); +} + +// Configure for the 2nd and 3rd lines +void configureLightLayer(TextLayer *textlayer) +{ + text_layer_set_font(textlayer, lightFont); + text_layer_set_text_color(textlayer, GColorWhite); + text_layer_set_background_color(textlayer, GColorClear); + text_layer_set_text_alignment(textlayer, GTextAlignmentLeft); +} + void handle_init(AppContextRef ctx) { (void)ctx; @@ -219,6 +220,9 @@ void handle_init(AppContextRef ctx) { // Init resources resource_init_current_app(&APP_RESOURCES); + // Custom fonts + lightFont = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_GOTHAM_LIGHT_32)); + // 1st line layers text_layer_init(&line1.currentLayer, GRect(0, 18, 144, 50)); text_layer_init(&line1.nextLayer, GRect(144, 18, 144, 50)); From de085e7f05c4f3f5f6492a14ca67176e118a8c06 Mon Sep 17 00:00:00 2001 From: Mihai Dumitrache Date: Mon, 15 Apr 2013 20:46:52 +0300 Subject: [PATCH 3/8] New fonts and layout update --- resources/src/fonts/gotham_bold_36.ttf | Bin 0 -> 66315 bytes ...{gotham_light_32.ttf => gotham_light_31.ttf} | Bin resources/src/resource_map.json | 9 +++++++-- resources/wscript | 1 + src/TextWatch.c | 12 ++++++------ src/num2words-ro.c | 16 +++++++++++++--- 6 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 resources/src/fonts/gotham_bold_36.ttf rename resources/src/fonts/{gotham_light_32.ttf => gotham_light_31.ttf} (100%) create mode 120000 resources/wscript diff --git a/resources/src/fonts/gotham_bold_36.ttf b/resources/src/fonts/gotham_bold_36.ttf new file mode 100644 index 0000000000000000000000000000000000000000..4d49611738b1ed0a4a8dcd08552d6dba0e114e16 GIT binary patch literal 66315 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 literal 0 HcmV?d00001 diff --git a/resources/src/fonts/gotham_light_32.ttf b/resources/src/fonts/gotham_light_31.ttf similarity index 100% rename from resources/src/fonts/gotham_light_32.ttf rename to resources/src/fonts/gotham_light_31.ttf diff --git a/resources/src/resource_map.json b/resources/src/resource_map.json index cc1a2bd..127c752 100644 --- a/resources/src/resource_map.json +++ b/resources/src/resource_map.json @@ -4,8 +4,13 @@ "media": [ { "type": "font", - "defName": "FONT_GOTHAM_LIGHT_32", - "file": "fonts/gotham_light_32.ttf" + "defName": "FONT_GOTHAM_LIGHT_31", + "file": "fonts/gotham_light_31.ttf" + }, + { + "type": "font", + "defName": "FONT_GOTHAM_BOLD_36", + "file": "fonts/gotham_bold_36.ttf" } ] } diff --git a/resources/wscript b/resources/wscript new file mode 120000 index 0000000..3fa9ff7 --- /dev/null +++ b/resources/wscript @@ -0,0 +1 @@ +/Users/mmdumi/Pebble/pebble-dev/pebble-sdk-release-001/sdk/resources/wscript \ No newline at end of file diff --git a/src/TextWatch.c b/src/TextWatch.c index ca80f98..5a2dd2b 100644 --- a/src/TextWatch.c +++ b/src/TextWatch.c @@ -35,13 +35,12 @@ Line line3; PblTm t; GFont lightFont; +GFont boldFont; static char line1Str[2][BUFFER_SIZE]; static char line2Str[2][BUFFER_SIZE]; static char line3Str[2][BUFFER_SIZE]; -static bool textInitialized = false; - // Animation handler void animationStoppedHandler(struct Animation *animation, bool finished, void *context) { @@ -195,7 +194,7 @@ void click_config_provider(ClickConfig **config, Window *window) { // Configure the first line of text void configureBoldLayer(TextLayer *textlayer) { - text_layer_set_font(textlayer, fonts_get_system_font(FONT_KEY_GOTHAM_42_BOLD)); + text_layer_set_font(textlayer, boldFont); text_layer_set_text_color(textlayer, GColorWhite); text_layer_set_background_color(textlayer, GColorClear); text_layer_set_text_alignment(textlayer, GTextAlignmentLeft); @@ -221,7 +220,8 @@ void handle_init(AppContextRef ctx) { resource_init_current_app(&APP_RESOURCES); // Custom fonts - lightFont = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_GOTHAM_LIGHT_32)); + lightFont = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_GOTHAM_LIGHT_31)); + boldFont = fonts_load_custom_font(resource_get_handle(RESOURCE_ID_FONT_GOTHAM_BOLD_36)); // 1st line layers text_layer_init(&line1.currentLayer, GRect(0, 18, 144, 50)); @@ -236,8 +236,8 @@ void handle_init(AppContextRef ctx) { configureLightLayer(&line2.nextLayer); // 3rd layers - text_layer_init(&line3.currentLayer, GRect(0, 92, 144, 50)); - text_layer_init(&line3.nextLayer, GRect(144, 92, 144, 50)); + text_layer_init(&line3.currentLayer, GRect(0, 85, 144, 50)); + text_layer_init(&line3.nextLayer, GRect(144, 85, 144, 50)); configureLightLayer(&line3.currentLayer); configureLightLayer(&line3.nextLayer); diff --git a/src/num2words-ro.c b/src/num2words-ro.c index 49fed53..9416691 100755 --- a/src/num2words-ro.c +++ b/src/num2words-ro.c @@ -98,7 +98,7 @@ void time_to_3words(int hours, int minutes, char *line1, char *line2, char *line memset(line1, 0, length); memset(line2, 0, length); memset(line3, 0, length); - + char *start = value; char *pch = strstr (start, " "); while (pch != NULL) { @@ -114,11 +114,21 @@ void time_to_3words(int hours, int minutes, char *line1, char *line2, char *line } // Truncate long teen values - if (strlen(line2) > 7) { - char *pch = strstr(line2, "sprezece"); + pch = strstr(line2, "sprezece"); + if (strlen(line2) > 7 && pch) { if (pch) { memcpy(line3, pch, 8); pch[0] = 0; } + } else if (strlen(line3) != 0) { + // Changing "doua" to "doi" + if (memcmp(line3, "doua", 4) == 0) { + memset(line3, 0, strlen(line3)); + memcpy(line3, "doi", 3); + } + + memmove(line3+3, line3, strlen(line3)); + memcpy(line3, "si ", 3); + } } \ No newline at end of file From 52f0675210238b8886367426a4c2a4f23c237f62 Mon Sep 17 00:00:00 2001 From: Mihai Dumitrache Date: Mon, 15 Apr 2013 20:51:16 +0300 Subject: [PATCH 4/8] Screenshot --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dd6e88d..b0e782b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ PebbleTextWatch =============== -Pebble Text Watch implementation with animation \ No newline at end of file +![Screenshot](http://c.wip.ro/image/2O1i1j1k2J0N/photo.JPG) From 28b72ac57ba62e57d5e39c5abdb0c0a41ee3ea6e Mon Sep 17 00:00:00 2001 From: Mihai Dumitrache Date: Tue, 16 Apr 2013 09:58:18 +0300 Subject: [PATCH 5/8] Unsprezece hour fix --- resources/wscript | 1 - src/num2words-ro.c | 19 +++++++++++++------ 2 files changed, 13 insertions(+), 7 deletions(-) delete mode 120000 resources/wscript diff --git a/resources/wscript b/resources/wscript deleted file mode 120000 index 3fa9ff7..0000000 --- a/resources/wscript +++ /dev/null @@ -1 +0,0 @@ -/Users/mmdumi/Pebble/pebble-dev/pebble-sdk-release-001/sdk/resources/wscript \ No newline at end of file diff --git a/src/num2words-ro.c b/src/num2words-ro.c index 9416691..7d01eba 100755 --- a/src/num2words-ro.c +++ b/src/num2words-ro.c @@ -115,11 +115,9 @@ void time_to_3words(int hours, int minutes, char *line1, char *line2, char *line // Truncate long teen values pch = strstr(line2, "sprezece"); - if (strlen(line2) > 7 && pch) { - if (pch) { - memcpy(line3, pch, 8); - pch[0] = 0; - } + if (pch) { + memcpy(line3, pch, 8); + pch[0] = 0; } else if (strlen(line3) != 0) { // Changing "doua" to "doi" if (memcmp(line3, "doua", 4) == 0) { @@ -129,6 +127,15 @@ void time_to_3words(int hours, int minutes, char *line1, char *line2, char *line memmove(line3+3, line3, strlen(line3)); memcpy(line3, "si ", 3); - + } + + if (memcmp(line1, "unsprezece", 10) == 0) { + memset(line1, 0, strlen(line1)); + memcpy(line1, "unspe", 5); + } + + if (memcmp(line1, "doispre", 7) == 0) { + memset(line1, 0, strlen(line1)); + memcpy(line1, "doispe", 6); } } \ No newline at end of file From 68c614704b7d8acfb3361aa8ce4f957e85c42cc4 Mon Sep 17 00:00:00 2001 From: vladiczek Date: Mon, 8 Jul 2013 02:15:58 +0200 Subject: [PATCH 6/8] Update and rename num2words-ro.c to num2words-cz.c czech version --- src/{num2words-ro.c => num2words-cz.c} | 62 +++++++++++++------------- 1 file changed, 31 insertions(+), 31 deletions(-) rename src/{num2words-ro.c => num2words-cz.c} (85%) mode change 100755 => 100644 diff --git a/src/num2words-ro.c b/src/num2words-cz.c old mode 100755 new mode 100644 similarity index 85% rename from src/num2words-ro.c rename to src/num2words-cz.c index 7d01eba..c8d7fc0 --- a/src/num2words-ro.c +++ b/src/num2words-cz.c @@ -1,43 +1,43 @@ -#include "num2words-ro.h" +#include "num2words-cz.h" #include "string.h" static const char* const ONES[] = { - "", - "unu", - "doua", - "trei", - "patru", - "cinci", - "sase", - "sapte", - "opt", - "noua" + "hodin", + "jedna", + "dva", + "tři", + "čtyři", + "pět", + "šest", + "sedm", + "osm", + "devět" }; static const char* const TEENS[] ={ "", - "unsprezece", - "doisprezece", - "treisprezece", - "patrusprezece", - "cincisprezece", - "saisprezece", - "saptesprezece", - "optsprezece", - "nouasprezece" + "jedenáct", + "dvanáct", + "třináct", + "čtrnáct", + "patnáct", + "šestnáct", + "sedmnáct", + "osmnáct", + "devatenáct" }; static const char* const TENS[] = { "", - "zece", - "douazeci", - "treizeci", - "patruzeci", - "cincizeci", - "saizeci", - "saptezeci", - "optzeci", - "nouazeci" + "deset", + "dvacet", + "třicet", + "čtyřicet", + "padesát", + "šedesát", + "sedmdesát", + "osmdesát", + "devadesát" }; static size_t append_number(char* words, int num) { @@ -114,7 +114,7 @@ void time_to_3words(int hours, int minutes, char *line1, char *line2, char *line } // Truncate long teen values - pch = strstr(line2, "sprezece"); + pch = strstr(line2, "náct"); if (pch) { memcpy(line3, pch, 8); pch[0] = 0; @@ -138,4 +138,4 @@ void time_to_3words(int hours, int minutes, char *line1, char *line2, char *line memset(line1, 0, strlen(line1)); memcpy(line1, "doispe", 6); } -} \ No newline at end of file +} From e1a83b9b23a1d046238b74dfd6945641a05cfb92 Mon Sep 17 00:00:00 2001 From: vladiczek Date: Mon, 8 Jul 2013 02:16:51 +0200 Subject: [PATCH 7/8] Rename num2words-ro.h to num2words-cz.h czech version --- src/{num2words-ro.h => num2words-cz.h} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{num2words-ro.h => num2words-cz.h} (100%) mode change 100755 => 100644 diff --git a/src/num2words-ro.h b/src/num2words-cz.h old mode 100755 new mode 100644 similarity index 100% rename from src/num2words-ro.h rename to src/num2words-cz.h From 10171cc7e841a0378ceef1a4c9f710e1e29d3f49 Mon Sep 17 00:00:00 2001 From: vladiczek Date: Mon, 8 Jul 2013 02:17:57 +0200 Subject: [PATCH 8/8] Update TextWatch.c czech version --- src/TextWatch.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TextWatch.c b/src/TextWatch.c index 5a2dd2b..9c0bd2e 100644 --- a/src/TextWatch.c +++ b/src/TextWatch.c @@ -3,7 +3,7 @@ #include "pebble_fonts.h" #include "resource_ids.auto.h" -#include "num2words-ro.h" +#include "num2words-cz.h" #define DEBUG 0 #define BUFFER_SIZE 44