From 14ea8103403cde1a0055ded2dcea9033f2337b76 Mon Sep 17 00:00:00 2001 From: flu0r1ne Date: Fri, 14 Jul 2023 14:34:27 -0500 Subject: Change layout 100% read view window, add copyright + Added authorship, copyright notice, and link to the code + Increased size of the +1 buttons + Changed layout so the +1 buttons would be prioritized + Adjusted margins to fit content within the iOS window --- makefile | 4 +- src/controllers/timer_view.cpp | 17 ++++----- src/view/index.html | 86 +++++++++++++++++++++++++----------------- 3 files changed, 62 insertions(+), 45 deletions(-) diff --git a/makefile b/makefile index 1dd3151..00810c4 100644 --- a/makefile +++ b/makefile @@ -46,8 +46,8 @@ $(DIST_BUILD_DIR)/%.o: src/%.cpp $(VIEW_DIRECTORIES): mkdir -p $@ -$(VIEW_FILES): - cp $(patsubst $(DIST_DIR)/%,$(SRC_VIEW)/%,$@) $@ +$(DIST_DIR)/%: $(SRC_VIEW)/% + cp $^ $@ $(DIST_DIR): mkdir -p $(DIST_DIR) diff --git a/src/controllers/timer_view.cpp b/src/controllers/timer_view.cpp index 03e8bb5..13d6960 100644 --- a/src/controllers/timer_view.cpp +++ b/src/controllers/timer_view.cpp @@ -101,7 +101,7 @@ class TimerController { void handle_inc_time(uint32_t amount) { _timer.increment_preset_ms(amount * 1000); - + _clear_counters_and_alarm(); _update_labels(); } @@ -190,22 +190,21 @@ class TimerController { _view.set_clear_reset_button_disabled(_timer.running()); } - void clear() { - _timer.clear(); - + void _clear_counters_and_alarm() { for(FreqCounter & counter : _counters) counter.reset(); _alarm_sound_triggered = false; } + void clear() { + _timer.clear(); + _clear_counters_and_alarm(); + } + void reset() { _timer.reset(); - - for(FreqCounter & counter : _counters) - counter.reset(); - - _alarm_sound_triggered = false; + _clear_counters_and_alarm(); } }; diff --git a/src/view/index.html b/src/view/index.html index 32dd74e..0b66bc8 100644 --- a/src/view/index.html +++ b/src/view/index.html @@ -19,16 +19,30 @@ } .btn-llg { - padding: 0.5rem 1.0rem; + padding: 0.7rem 1.0rem; font-size: 1.6rem; border-radius: 0.3rem; } .btn-plus { - padding: 1rem 1rem; - font-size: 1.4rem; + padding: 1.3rem 1rem; + font-size: 1.6rem; border-radius: 0.3rem; } + + a { + text-decoration: none; + } + + .copyright { + text-align: center; + font-size: 0.8rem; + } + + html, body, main { + height: 100%; + touch-action: none; + } @@ -66,37 +80,40 @@ timer_controller.handle_timer_update(); } }, 10); + + window.addEventListener('load', function () { + const copyrightYearEl = document.getElementById("copyright-year"); + copyrightYearEl.innerText = (new Date()).getUTCFullYear(); + }) - +

00 : 00 : 00 . 0

00 : 00 : 00.0

Record floor: 00.00

Counter 1

0

00.00

Counter 1

0

00.00

Counter 2

0

00.00

Counter 2

0

00.00

- - -

+ +

-- cgit v1.2.3