Skip to content

Add JS unit tests and GitHub Actions CI #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

Merged
markrcote merged 3 commits into from
Jun 2, 2026
Merged

Add JS unit tests and GitHub Actions CI #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfd54f0
Add JS unit tests and GitHub Actions CI
claude Jun 1, 2026
cd01264
Address review comments on timer.js and index.html
claude Jun 1, 2026
ca0d33d
Fix Math.round early-exit bug and align test DOM with real initial state
claude Jun 1, 2026
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
18 changes: 18 additions & 0 deletions .github/workflows/js-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
name: JS Tests

on:
push:
branches: ["**"]
pull_request:

jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 22
cache: npm
- run: npm ci
- run: npm test
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@
local.properties
/app/release
keystore.properties
node_modules
177 changes: 20 additions & 157 deletions app/src/main/assets/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,159 +220,25 @@ <h1>German Volume Training</h1>
</div>
</div>

<script src="timer.js"></script>
<script>
let setCount = 0;
let REST_SECONDS = 60;
let TARGET_SETS = 10;
let timeRemaining = REST_SECONDS;
let timerInterval = null;
let isResting = false;
let restEndTime = null; // wall-clock ms when rest period ends

const timeDisplay = document.getElementById('timeDisplay');
const setCountDisplay = document.getElementById('setCount');
const setTotalDisplay = document.getElementById('setTotal');
setTotalDisplay.textContent = TARGET_SETS;
const timerLabel = document.getElementById('timerLabel');
const completeSetBtn = document.getElementById('completeSetBtn');
const resetBtn = document.getElementById('resetBtn');
const resetAllBtn = document.getElementById('resetAllBtn');

function formatTime(seconds) {
const mins = Math.floor(seconds / 60);
const secs = seconds % 60;
return `${String(mins).padStart(2, '0')}:${String(secs).padStart(2, '0')}`;
}

function updateDisplay() {
if (isResting) {
timeDisplay.textContent = formatTime(timeRemaining);
}
setCountDisplay.textContent = setCount;
}

function playTones(tones) {
const audioContext = new (window.AudioContext || window.webkitAudioContext)();
tones.forEach(({ freq, start, duration }) => {
const oscillator = audioContext.createOscillator();
const gainNode = audioContext.createGain();
oscillator.connect(gainNode);
gainNode.connect(audioContext.destination);
oscillator.type = 'square';
oscillator.frequency.value = freq;
gainNode.gain.setValueAtTime(0.3, audioContext.currentTime + start);
gainNode.gain.exponentialRampToValueAtTime(0.001, audioContext.currentTime + start + duration);
oscillator.start(audioContext.currentTime + start);
oscillator.stop(audioContext.currentTime + start + duration);
});
}

// Three ascending beeps: rest is over, time for the next set
function playRestEnd() {
playTones([
{ freq: 220, start: 0.0, duration: 0.12 },
{ freq: 220, start: 0.15, duration: 0.12 },
{ freq: 330, start: 0.32, duration: 0.35 },
]);
}

// Rising arpeggio fanfare: all sets complete
function playExerciseComplete() {
playTones([
{ freq: 196, start: 0.0, duration: 0.15 },
{ freq: 247, start: 0.18, duration: 0.15 },
{ freq: 294, start: 0.36, duration: 0.15 },
{ freq: 392, start: 0.54, duration: 0.6 },
]);
}

function enableCompleteSetBtns() {
completeSetBtn.disabled = false;
completeSetBtn.style.opacity = '1';
completeSetBtn.style.cursor = 'pointer';
}

function startRestTimer() {
isResting = true;
timeRemaining = REST_SECONDS;
restEndTime = Date.now() + REST_SECONDS * 1000;
timerLabel.style.display = 'block';
updateDisplay();
completeSetBtn.disabled = true;
completeSetBtn.style.opacity = '0.5';
completeSetBtn.style.cursor = 'not-allowed';

if (typeof Android !== 'undefined') {
Android.scheduleNotification(REST_SECONDS);
}

timerInterval = setInterval(() => {
// Compute from wall clock so backgrounding can't cause drift
timeRemaining = Math.max(0, Math.round((restEndTime - Date.now()) / 1000));
updateDisplay();

if (timeRemaining <= 0) {
clearInterval(timerInterval);
// Cancel alarm if user stayed in-app and it hasn't fired yet
if (typeof Android !== 'undefined') {
Android.cancelNotification();
}
timeDisplay.textContent = '';
timerLabel.style.display = 'none';
isResting = false;
enableCompleteSetBtns();
// Skip chime if returning from background — notification already alerted the user
if (Date.now() - restEndTime < 2000) {
playRestEnd();
}
}
}, 250);
}

function completeSet() {
if (isResting) return;

setCount++;
updateDisplay();

if (setCount >= TARGET_SETS) {
// Exercise complete
clearInterval(timerInterval);
completeSetBtn.style.display = 'none';
resetBtn.style.display = 'block';
resetAllBtn.style.display = 'none';
timeDisplay.textContent = 'Done!';
timerLabel.textContent = 'Exercise Complete';
timerLabel.style.display = 'block';
playExerciseComplete();
} else {
// Start rest timer
startRestTimer();
}
}

function resetExercise() {
clearInterval(timerInterval);
if (typeof Android !== 'undefined') {
Android.cancelNotification();
}
setCount = 0;
timeRemaining = REST_SECONDS;
restEndTime = null;
isResting = false;
completeSetBtn.style.display = '';
enableCompleteSetBtns();
resetBtn.style.display = 'none';
resetAllBtn.style.display = '';
timeDisplay.textContent = '';
timerLabel.style.display = 'none';
timerLabel.textContent = 'Rest Timer';
updateDisplay();
}
const resetBtn = document.getElementById('resetBtn');
const resetAllBtn = document.getElementById('resetAllBtn');

const timer = initTimer({
timeDisplay: document.getElementById('timeDisplay'),
setCountDisplay: document.getElementById('setCount'),
setTotalDisplay: document.getElementById('setTotal'),
timerLabel: document.getElementById('timerLabel'),
completeSetBtn,
resetBtn,
resetAllBtn,
});

completeSetBtn.addEventListener('click', completeSet);
resetBtn.addEventListener('click', resetExercise);
resetAllBtn.addEventListener('click', resetExercise);
completeSetBtn.addEventListener('click', () => timer.completeSet());
resetBtn.addEventListener('click', () => timer.resetExercise());
resetAllBtn.addEventListener('click', () => timer.resetExercise());

// Secret debug mode: tap the title 5 times quickly to toggle 2 sets / 2-second timer
let debugMode = false;
Expand All @@ -385,15 +251,12 @@ <h1>German Volume Training</h1>
if (debugTapCount >= 5) {
debugTapCount = 0;
debugMode = !debugMode;
TARGET_SETS = debugMode ? 2 : 10;
REST_SECONDS = debugMode ? 2 : 60;
setTotalDisplay.textContent = TARGET_SETS;
resetExercise();
timer.setConfig({
restSeconds: debugMode ? 2 : 60,
targetSets: debugMode ? 2 : 10,
});
}
});

// Initialize display
updateDisplay();
</script>
</body>
</html>
174 changes: 174 additions & 0 deletions app/src/main/assets/timer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
function formatTime(seconds) {
const mins = Math.floor(seconds / 60);
const secs = seconds % 60;
return `${String(mins).padStart(2, '0')}:${String(secs).padStart(2, '0')}`;
}

function playTones(tones) {
const AudioCtx = (typeof window !== 'undefined') && (window.AudioContext || window.webkitAudioContext);
if (!AudioCtx) return;
const audioContext = new AudioCtx();
const lastEnd = Math.max(...tones.map(t => t.start + t.duration));
tones.forEach(({ freq, start, duration }) => {
const oscillator = audioContext.createOscillator();
const gainNode = audioContext.createGain();
oscillator.connect(gainNode);
gainNode.connect(audioContext.destination);
oscillator.type = 'square';
oscillator.frequency.value = freq;
gainNode.gain.setValueAtTime(0.3, audioContext.currentTime + start);
gainNode.gain.exponentialRampToValueAtTime(0.001, audioContext.currentTime + start + duration);
oscillator.start(audioContext.currentTime + start);
oscillator.stop(audioContext.currentTime + start + duration);
});
setTimeout(() => audioContext.close(), (lastEnd + 0.1) * 1000);
}
Comment thread
markrcote marked this conversation as resolved.

// Three ascending beeps: rest is over, time for the next set
function playRestEnd() {
playTones([
{ freq: 220, start: 0.0, duration: 0.12 },
{ freq: 220, start: 0.15, duration: 0.12 },
{ freq: 330, start: 0.32, duration: 0.35 },
]);
}

// Rising arpeggio fanfare: all sets complete
function playExerciseComplete() {
playTones([
{ freq: 196, start: 0.0, duration: 0.15 },
{ freq: 247, start: 0.18, duration: 0.15 },
{ freq: 294, start: 0.36, duration: 0.15 },
{ freq: 392, start: 0.54, duration: 0.6 },
]);
}

// opts: { restSeconds, targetSets, now, onRestEnd, onExerciseComplete }
// now – injectable clock function (defaults to Date.now); used for testing
// onRestEnd – called when rest ends while foregrounded (defaults to playRestEnd)
// onExerciseComplete – called when all sets done (defaults to playExerciseComplete)
function initTimer(els, opts = {}) {
const now = opts.now || (() => Date.now());
const onRestEnd = opts.onRestEnd !== undefined ? opts.onRestEnd : playRestEnd;
const onExerciseComplete = opts.onExerciseComplete !== undefined ? opts.onExerciseComplete : playExerciseComplete;
Comment thread
markrcote marked this conversation as resolved.

let setCount = 0;
let REST_SECONDS = opts.restSeconds !== undefined ? opts.restSeconds : 60;
let TARGET_SETS = opts.targetSets !== undefined ? opts.targetSets : 10;
let timeRemaining = REST_SECONDS;
let timerInterval = null;
let isResting = false;
let restEndTime = null;

els.setTotalDisplay.textContent = String(TARGET_SETS);

function updateDisplay() {
if (isResting) {
els.timeDisplay.textContent = formatTime(timeRemaining);
}
els.setCountDisplay.textContent = String(setCount);
}

function enableCompleteSetBtns() {
els.completeSetBtn.disabled = false;
els.completeSetBtn.style.opacity = '1';
els.completeSetBtn.style.cursor = 'pointer';
}

function startRestTimer() {
isResting = true;
timeRemaining = REST_SECONDS;
restEndTime = now() + REST_SECONDS * 1000;
els.timerLabel.style.display = 'block';
updateDisplay();
els.completeSetBtn.disabled = true;
els.completeSetBtn.style.opacity = '0.5';
els.completeSetBtn.style.cursor = 'not-allowed';

if (typeof Android !== 'undefined') {
Android.scheduleNotification(REST_SECONDS);
}

timerInterval = setInterval(() => {
// Compute from wall clock so backgrounding can't cause drift
timeRemaining = Math.max(0, Math.ceil((restEndTime - now()) / 1000));
updateDisplay();
Comment thread
markrcote marked this conversation as resolved.

if (timeRemaining <= 0) {
clearInterval(timerInterval);
// Cancel alarm if user stayed in-app and it hasn't fired yet
if (typeof Android !== 'undefined') {
Android.cancelNotification();
}
els.timeDisplay.textContent = '';
els.timerLabel.style.display = 'none';
isResting = false;
enableCompleteSetBtns();
// Skip chime if returning from background — notification already alerted the user
if (now() - restEndTime < 2000) {
onRestEnd();
}
}
}, 250);
}

function completeSet() {
if (isResting) return;
setCount++;
updateDisplay();

if (setCount >= TARGET_SETS) {
clearInterval(timerInterval);
els.completeSetBtn.style.display = 'none';
els.resetBtn.style.display = 'block';
els.resetAllBtn.style.display = 'none';
els.timeDisplay.textContent = 'Done!';
els.timerLabel.textContent = 'Exercise Complete';
els.timerLabel.style.display = 'block';
onExerciseComplete();
} else {
startRestTimer();
}
}

function resetExercise() {
clearInterval(timerInterval);
if (typeof Android !== 'undefined') {
Android.cancelNotification();
}
setCount = 0;
timeRemaining = REST_SECONDS;
restEndTime = null;
isResting = false;
els.completeSetBtn.style.display = '';
enableCompleteSetBtns();
els.resetBtn.style.display = 'none';
els.resetAllBtn.style.display = '';
els.timeDisplay.textContent = '';
els.timerLabel.style.display = 'none';
els.timerLabel.textContent = 'Rest Timer';
updateDisplay();
}

function setConfig({ restSeconds, targetSets } = {}) {
if (restSeconds !== undefined) REST_SECONDS = restSeconds;
if (targetSets !== undefined) {
TARGET_SETS = targetSets;
els.setTotalDisplay.textContent = String(TARGET_SETS);
}
resetExercise();
}

updateDisplay();

return {
completeSet,
resetExercise,
setConfig,
getState: () => ({ setCount, timeRemaining, isResting, restEndTime, REST_SECONDS, TARGET_SETS }),
};
}

if (typeof module !== 'undefined') {
module.exports = { formatTime, initTimer };
}
Comment on lines +172 to +174
Loading
Loading