Skip to content

Configurable splash screen, disabled by default #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Bikonja wants to merge 1 commit into
base: watchface
Choose a base branch
from
Open

Configurable splash screen, disabled by default #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion appinfo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"uuid": "55f7744b-f586-45b8-854c-554f34489f20",
"shortName": "Timely",
"longName": "Timely 2.5",
"longName": "Timely 2.5.1",
"companyName": "Martin Norland (@cynorg)",
"versionCode": 2,
"versionLabel": "2.5",
Expand Down Expand Up @@ -47,6 +47,7 @@
"idle_stop": 34,
"weather_fmt": 35,
"weather_update": 36,
"show_splash": 37,

"message_type": 99,
"send_batt_percent": 100,
Expand Down
16 changes: 10 additions & 6 deletions src/Timely.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,7 @@ weather_data weather = {
persist settings = {
.version = 12,
.inverted = 0, // no, dark
.show_splash = 0, // show splash screen on start
.day_invert = 1, // yes
.grid = 1, // yes
.vibe_hour = 0, // no
Expand Down Expand Up @@ -1447,14 +1448,17 @@ static void window_load(Window *window) {
calendar_layer = layer_create(slot_bot_bounds);
layer_set_update_proc(calendar_layer, calendar_layer_update_callback);
layer_add_child(slot_bot, calendar_layer);
layer_set_hidden(calendar_layer, true);

splash_layer = layer_create(slot_bot_bounds);
layer_set_update_proc(splash_layer, splash_layer_update_callback);
layer_add_child(slot_bot, splash_layer);

toggle_slot_bottom((void*)splash_layer); // show @ start...
bottom_toggle = app_timer_register(2000, &toggle_slot_bottom, (void*)calendar_layer); // queue calendar to reappear in 2 seconds
if (settings.show_splash) {
layer_set_hidden(calendar_layer, true);

layer_set_update_proc(splash_layer, splash_layer_update_callback);
layer_add_child(slot_bot, splash_layer);

toggle_slot_bottom((void*)splash_layer); // show @ start...
bottom_toggle = app_timer_register(2000, &toggle_slot_bottom, (void*)calendar_layer); // queue calendar to reappear in 2 seconds
}

date_layer = text_layer_create( GRect(REL_CLOCK_DATE_LEFT, REL_CLOCK_DATE_TOP, REL_CLOCK_DATE_WIDTH, REL_CLOCK_DATE_HEIGHT) ); // see position_date_layer()
set_layer_attr_sfont(date_layer, FONT_KEY_GOTHIC_24, GTextAlignmentCenter);
Expand Down
1 change: 1 addition & 0 deletions src/Timely.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ typedef struct persist { // 18 bytes
uint8_t version; // version key
uint8_t inverted; // Invert display
uint8_t day_invert; // Invert colors on today's date
uint8_t show_splash; // Show the splash screen
uint8_t grid; // Show the grid
uint8_t vibe_hour; // vibrate at the top of the hour?
uint8_t dayOfWeekOffset; // first day of our week
Expand Down
11 changes: 11 additions & 0 deletions src/js/configuration.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,14 @@ <h3>General</h3>
<label for="key12-7">Ow</label>
</fieldset>

<fieldset data-role="controlgroup" data-type="horizontal" data-mini="true">
<legend>Show splash screen:</legend>
<input name="key37" id="key37-1" value="1" checked="checked" type="radio">
<label for="key37-1">Yes</label>
<input name="key37" id="key37-0" value="0" type="radio">
<label for="key37-0">No</label>
</fieldset>

</div>
<div data-role="collapsible">
<h3>Translations</h3>
Expand Down Expand Up @@ -335,6 +343,7 @@ <h3>Calendar</h3>
function saveOptions() {
var options = {
'style_inv': Number( $("input[name=key0]:checked").val() ),
'show_splash': Number( $("input[name=key37]:checked").val() ),
'style_day_inv': Number( $("input[name=key1]:checked").val() ),
'style_grid': Number( $("input[name=key2]:checked").val() ),
'vibe_hour': Number( $("input[name=key3]:checked").val() ),
Expand Down Expand Up @@ -385,6 +394,8 @@ <h3>Calendar</h3>
// the Pebble webview dies on the next line...
$("input[name=key0][id=key0-"+ls_pto["style_inv"]+"]").prop('checked',true);
$("input[name=key0]").checkboxradio('refresh');
$("input[name=key37][id=key37-"+ls_pto["show_splash"]+"]").prop('checked',true);
$("input[name=key37]").checkboxradio('refresh');
$("input[name=key1][id=key1-"+ls_pto["style_day_inv"]+"]").prop('checked',true);
$("input[name=key1]").checkboxradio('refresh');
$("input[name=key2][id=key2-"+ls_pto["style_grid"]+"]").prop('checked',true);
Expand Down