+ {{ t('pomodoroExplanationIcon.message') }}
+ 
.
+ {{ t('pomodoroExplanationIcon.description') }}
+ 
.
+
+ {{ t('pomodoroExplanationTime.message') }} +
+{{ t('pomodoroExplanationStop.message') }}
+{{ t('pomodoro.message') }}
++ {{ t('pomodoro.description') }} +
+
+ {{ t('pomodoroExplanationIcon.message') }}
+ .
+ {{ t('pomodoroExplanationIcon.description') }}
+ .
+
+ {{ t('pomodoroExplanationTime.message') }} +
+{{ t('pomodoroExplanationStop.message') }}
+{{ t('pomodoroWork.message') }}
+{{ t('pomodoroRest.message') }}
+{{ t('pomodoroFrequency.message') }}
+ +{{ t('pomodoroIsEnabled.message') }}
+ {{ t('pomodoroWork.message') }} + {{ t('pomodoroRest.message') }} + +{{ t('pomodoroSoundAfter.message') }}
+ +
+ {{ t('clickToPreview.message') }}
+
+
+
+
+
+
+
diff --git a/src/components/Review.vue b/src/components/Review.vue
index b12d619..c1cf061 100644
--- a/src/components/Review.vue
+++ b/src/components/Review.vue
@@ -82,6 +82,7 @@ async function openStore() {
display: inline-block;
margin: 8px;
font-size: 17px;
+ font-weight: 500;
}
.review-block img {
padding: 9px 0 0 0;
diff --git a/src/functions/playSound.ts b/src/functions/playSound.ts
new file mode 100644
index 0000000..61eb7f2
--- /dev/null
+++ b/src/functions/playSound.ts
@@ -0,0 +1,7 @@
+import Browser from 'webextension-polyfill';
+import { PomodoroSounds } from '../utils/pomodoro';
+
+export function playSound(sound: PomodoroSounds) {
+ const myAudio = new Audio(Browser.runtime.getURL(`assets/pomodoro-sounds/${sound}`));
+ myAudio.play();
+}
diff --git a/src/functions/pomodoro.ts b/src/functions/pomodoro.ts
index 49c74bf..afb639f 100644
--- a/src/functions/pomodoro.ts
+++ b/src/functions/pomodoro.ts
@@ -1,64 +1,152 @@
import { addSeconds } from 'date-fns';
import { injecStorage } from '../storage/inject-storage';
import { StorageParams } from '../storage/storage-params';
-import { Time, timeToSeconds } from '../utils/time';
import { useBadge, BadgeIcon, BadgeColor } from './useBadge';
+import { Settings } from './settings';
+import Browser from 'webextension-polyfill';
+import { logger } from '../utils/logger';
+import { Messages } from '../utils/messages';
+import { isDateEqual } from '../utils/date';
+import { createOffscreen } from '../offscreen/index';
export async function checkPomodoro() {
- function isTargetPeriod(isRest: boolean) {
+ type PomodoroPeriod = {
+ period: Period;
+ isTargetPeriod: boolean;
+ isTargetPeriodFinishedNow: boolean;
+ };
+
+ enum Period {
+ work = 'WORK',
+ rest = 'REST',
+ finished = 'FINISH',
+ }
+
+ function isTargetPeriod(period: Period): PomodoroPeriod {
+ let isPomodoroTargetPeriodEnd;
for (let index = 1; index <= frequency; index++) {
- const plusWorkingTime = timeToSeconds(workTime) * (isRest ? index : index--);
- const plusRestTime = timeToSeconds(restTime) * index--;
+ let ind = period == Period.work ? index - 1 : index;
+ const plusWorkingTime = workTime * ind;
+ const plusRestTime = (restTime + 1) * (index - 1);
const isPomodoroTargetPeriodStart = addSeconds(startTime, plusWorkingTime + plusRestTime);
- const isPomodoroTargetPeriodEnd = addSeconds(
- startTime,
- plusWorkingTime + plusRestTime + timeToSeconds(workTime),
- );
+ isPomodoroTargetPeriodEnd = addSeconds(startTime, plusWorkingTime + plusRestTime + workTime);
const isTargetPeriod =
- now.getTime() >= isPomodoroTargetPeriodStart.getTime() &&
- now.getTime() <= isPomodoroTargetPeriodEnd.getTime();
+ now >= isPomodoroTargetPeriodStart &&
+ (now <= isPomodoroTargetPeriodEnd || addSeconds(now, -1) <= isPomodoroTargetPeriodEnd);
- if (isTargetPeriod) return true;
+ if (isTargetPeriod) {
+ console.log(
+ now,
+ isPomodoroTargetPeriodEnd,
+ isDateEqual(now, isPomodoroTargetPeriodEnd) ||
+ isDateEqual(addSeconds(now, -1), isPomodoroTargetPeriodEnd),
+ period,
+ );
+ return {
+ period: period,
+ isTargetPeriod: isTargetPeriod,
+ isTargetPeriodFinishedNow:
+ isDateEqual(now, isPomodoroTargetPeriodEnd) ||
+ isDateEqual(addSeconds(now, -1), isPomodoroTargetPeriodEnd),
+ };
+ }
}
- return false;
+ return {
+ period: Period.finished,
+ isTargetPeriod: false,
+ isTargetPeriodFinishedNow: false,
+ };
+ }
+
+ async function play(period: Period) {
+ function getSound() {
+ switch (period) {
+ case Period.work:
+ return StorageParams.POMODORO_AUDIO_AFTER_WORK;
+ case Period.rest:
+ return StorageParams.POMODORO_AUDIO_AFTER_REST;
+ case Period.finished:
+ return StorageParams.POMODORO_AUDIO_AFTER_FINISHED;
+ }
+ }
+ logger.log(`[Pomodoro] ${period}`);
+ const sound = await storage.getValue(getSound());
+ await createOffscreen();
+ await Browser.runtime.sendMessage({
+ message: Messages.PlayAudio,
+ sound: sound,
+ offscreen: true,
+ });
}
const storage = injecStorage();
- const isPomodoroEnabled = (await storage.getValue(StorageParams.IS_POMODORO_ENABLED)) as boolean;
+ const isPomodoroEnabled = (await Settings.getInstance().getSetting(
+ StorageParams.IS_POMODORO_ENABLED,
+ )) as boolean;
if (!isPomodoroEnabled) return;
- const startTime = (await storage.getValue(StorageParams.POMODORO_START_TIME)) as Date;
- const workTime = (await storage.getValue(StorageParams.POMODORO_INTERVAL_WORK)) as Time;
- const restTime = (await storage.getValue(StorageParams.POMODORO_INTERVAL_REST)) as Time;
- const frequency = (await storage.getValue(StorageParams.POMODORO_FREQUENCY)) as number;
+ const startTime = new Date(
+ (await Settings.getInstance().getSetting(StorageParams.POMODORO_START_TIME)) as string,
+ );
+ const workTime = (await Settings.getInstance().getSetting(
+ StorageParams.POMODORO_INTERVAL_WORK,
+ )) as number;
+ const restTime = (await Settings.getInstance().getSetting(
+ StorageParams.POMODORO_INTERVAL_REST,
+ )) as number;
+ const frequency = (await Settings.getInstance().getSetting(
+ StorageParams.POMODORO_FREQUENCY,
+ )) as number;
const now = new Date();
- const pomodoroEndTime = addSeconds(
- startTime,
- timeToSeconds(workTime) * frequency + timeToSeconds(restTime) * frequency,
- );
+ const pomodoroEndTime = addSeconds(startTime, workTime * frequency + restTime * frequency);
+
+ const activeTab = await Browser.tabs.query({ active: true });
+
+ if (now >= pomodoroEndTime) {
+ if (isDateEqual(now, pomodoroEndTime)) {
+ logger.log(`[Pomodoro] Pomodoro finished`);
+ await play(Period.finished);
+ }
- if (pomodoroEndTime > now) {
await storage.saveValue(StorageParams.IS_POMODORO_ENABLED, false);
await storage.saveValue(StorageParams.POMODORO_START_TIME, null);
+ await useBadge({
+ tabId: activeTab[0].id,
+ text: null,
+ color: BadgeColor.none,
+ icon: BadgeIcon.default,
+ });
return;
}
- const isWork = isTargetPeriod(false);
- const isRest = isTargetPeriod(true);
+ let target = isTargetPeriod(Period.work);
+ const isWork = target.isTargetPeriod;
- if (isWork)
+ if (isWork) {
await useBadge({
- text: '',
+ tabId: activeTab[0].id,
+ text: null,
color: BadgeColor.none,
icon: BadgeIcon.pomodoroWorkingTime,
});
- if (isRest)
- await useBadge({
- text: '',
- color: BadgeColor.none,
- icon: BadgeIcon.pomodoroRestTime,
- });
+ } else {
+ target = isTargetPeriod(Period.rest);
+ if (target.isTargetPeriod) {
+ await useBadge({
+ tabId: activeTab[0].id,
+ text: null,
+ color: BadgeColor.none,
+ icon: BadgeIcon.pomodoroRestTime,
+ });
+ }
+ }
+
+ if (target.isTargetPeriodFinishedNow) await play(target.period);
+
+ return {
+ isWork,
+ };
}
diff --git a/src/functions/useBadge.ts b/src/functions/useBadge.ts
index ddd9a6d..8854b25 100644
--- a/src/functions/useBadge.ts
+++ b/src/functions/useBadge.ts
@@ -1,16 +1,16 @@
import Browser from 'webextension-polyfill';
export interface BadgeState {
- text: string;
+ text: string | null;
color: BadgeColor;
tabId?: number;
icon?: BadgeIcon;
}
export enum BadgeIcon {
- timer = '/assets/icons/128x128.png',
- pomodoroWorkingTime = '/assets/icons/empty.png',
- pomodoroRestTime = '/assets/icons/empty.png',
+ default = '/128x128.png',
+ pomodoroWorkingTime = '/assets/icons/pomodoro.png',
+ pomodoroRestTime = '/assets/icons/pomodoro-rest.png',
}
export enum BadgeColor {
@@ -21,13 +21,22 @@ export enum BadgeColor {
}
export async function useBadge(badge: BadgeState): Promise
