haigeno1
diff --git a/‎src/assets/icons/pomodoro-rest.png‎
3.27 KB b/‎src/assets/icons/pomodoro-rest.png‎
3.27 KB
diff --git a/‎src/assets/icons/pomodoro.png‎
7.29 KB b/‎src/assets/icons/pomodoro.png‎
7.29 KB
diff --git a/‎src/block.html‎
Lines changed: 1 addition & 2 deletions b/‎src/block.html‎
Lines changed: 1 addition & 2 deletions
diff --git a/‎src/functions/useBadge.ts‎
Lines changed: 11 additions & 4 deletions b/‎src/functions/useBadge.ts‎
Lines changed: 11 additions & 4 deletions
diff --git a/‎src/tracker.ts‎
Lines changed: 8 additions & 2 deletions b/‎src/tracker.ts‎
Lines changed: 8 additions & 2 deletions
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -11,6 +11,5 @@
     <script type="module" src="./block.ts"></script>
   </body>
 
-  <!-- <link rel="stylesheet" href="assets/css/blocked.css" /> -->
   <link rel="stylesheet" href="assets/css/general.css" />
 </html>
@@ -8,9 +8,9 @@ export interface BadgeState {
 }
 
 export enum BadgeIcon {
-  timer = '/assets/icons/128x128.png',
-  pomodoroWorkingTime = '/assets/icons/empty.png',
-  pomodoroRestTime = '/assets/icons/empty.png',
+  default = '/assets/icons/128x128.png',
+  pomodoroWorkingTime = '/assets/icons/pomodoro.png',
+  pomodoroRestTime = '/assets/icons/pomodoro-rest-icon.png',
 }
 
 export enum BadgeColor {
@@ -26,8 +26,15 @@ export async function useBadge(badge: BadgeState): Promise<void> {
     tabId: badge.tabId,
     text: badge.text,
   });
-  if (badge.icon)
+  if (badge.icon) {
     await Browser.action.setIcon({
       path: badge.icon,
     });
+    await Browser.action.setBadgeText({
+      text: badge.text,
+    });
+  } else
+    await Browser.action.setIcon({
+      path: BadgeIcon.default,
+    });
 }
@@ -42,7 +42,7 @@ async function trackTime() {
 
       await checkPomodoro();
 
-      if (await isInBlackList(activeDomain)) {
+      if ((await isInBlackList(activeDomain)) && (await canChangeBadge())) {
         await useBadge({
           tabId: activeTab?.id,
           text: 'n/a',
@@ -127,7 +127,9 @@ async function mainTracker(
 
     tab.incSummaryTime();
 
-    const viewInBadge = await Settings.getInstance().getSetting(StorageParams.VIEW_TIME_IN_BADGE);
+    const viewInBadge =
+      (await Settings.getInstance().getSetting(StorageParams.VIEW_TIME_IN_BADGE)) &&
+      (await canChangeBadge());
 
     if (viewInBadge)
       await useBadge({
@@ -164,6 +166,10 @@ async function saveTabs() {
   await storage.saveTabs(tabs);
 }
 
+async function canChangeBadge() {
+  return !(await Settings.getInstance().getSetting(StorageParams.IS_POMODORO_ENABLED)) as boolean;
+}
+
 Browser.runtime.onMessage.addListener(async message => {
   if (message == Messages.ClearAllData) {
     const storage = injecStorage();