From 7161bb3f24f57d0e4f83805f32f615f03d471ff3 Mon Sep 17 00:00:00 2001 From: Einar Egilsson Date: Thu, 12 Dec 2019 10:36:04 +0000 Subject: Change badge on off setting --- images/icon-dark-128.png | Bin 1211 -> 0 bytes images/icon-dark-16.png | Bin 272 -> 0 bytes images/icon-dark-19.png | Bin 285 -> 0 bytes images/icon-dark-32.png | Bin 402 -> 0 bytes images/icon-dark-38.png | Bin 417 -> 0 bytes images/icon-dark-48.png | Bin 464 -> 0 bytes images/icon-dark-64.png | Bin 575 -> 0 bytes images/icon-dark-theme-128.png | Bin 0 -> 1202 bytes images/icon-dark-theme-16.png | Bin 0 -> 274 bytes images/icon-dark-theme-19.png | Bin 0 -> 285 bytes images/icon-dark-theme-32.png | Bin 0 -> 399 bytes images/icon-dark-theme-38.png | Bin 0 -> 424 bytes images/icon-dark-theme-48.png | Bin 0 -> 474 bytes images/icon-dark-theme-64.png | Bin 0 -> 583 bytes images/icon-light-128.png | Bin 1202 -> 0 bytes images/icon-light-16.png | Bin 274 -> 0 bytes images/icon-light-19.png | Bin 285 -> 0 bytes images/icon-light-32.png | Bin 399 -> 0 bytes images/icon-light-38.png | Bin 424 -> 0 bytes images/icon-light-48.png | Bin 474 -> 0 bytes images/icon-light-64.png | Bin 583 -> 0 bytes images/icon-light-theme-128.png | Bin 0 -> 1211 bytes images/icon-light-theme-16.png | Bin 0 -> 272 bytes images/icon-light-theme-19.png | Bin 0 -> 285 bytes images/icon-light-theme-32.png | Bin 0 -> 402 bytes images/icon-light-theme-38.png | Bin 0 -> 417 bytes images/icon-light-theme-48.png | Bin 0 -> 464 bytes images/icon-light-theme-64.png | Bin 0 -> 575 bytes js/background.js | 32 +++++++++++++++++------ manifest.json | 56 ++++++++++++++++++++-------------------- 30 files changed, 52 insertions(+), 36 deletions(-) delete mode 100644 images/icon-dark-128.png delete mode 100644 images/icon-dark-16.png delete mode 100644 images/icon-dark-19.png delete mode 100644 images/icon-dark-32.png delete mode 100644 images/icon-dark-38.png delete mode 100644 images/icon-dark-48.png delete mode 100644 images/icon-dark-64.png create mode 100644 images/icon-dark-theme-128.png create mode 100644 images/icon-dark-theme-16.png create mode 100644 images/icon-dark-theme-19.png create mode 100644 images/icon-dark-theme-32.png create mode 100644 images/icon-dark-theme-38.png create mode 100644 images/icon-dark-theme-48.png create mode 100644 images/icon-dark-theme-64.png delete mode 100644 images/icon-light-128.png delete mode 100644 images/icon-light-16.png delete mode 100644 images/icon-light-19.png delete mode 100644 images/icon-light-32.png delete mode 100644 images/icon-light-38.png delete mode 100644 images/icon-light-48.png delete mode 100644 images/icon-light-64.png create mode 100644 images/icon-light-theme-128.png create mode 100644 images/icon-light-theme-16.png create mode 100644 images/icon-light-theme-19.png create mode 100644 images/icon-light-theme-32.png create mode 100644 images/icon-light-theme-38.png create mode 100644 images/icon-light-theme-48.png create mode 100644 images/icon-light-theme-64.png diff --git a/images/icon-dark-128.png b/images/icon-dark-128.png deleted file mode 100644 index 5ef6a8b..0000000 Binary files a/images/icon-dark-128.png and /dev/null differ diff --git a/images/icon-dark-16.png b/images/icon-dark-16.png deleted file mode 100644 index 9482d4b..0000000 Binary files a/images/icon-dark-16.png and /dev/null differ diff --git a/images/icon-dark-19.png b/images/icon-dark-19.png deleted file mode 100644 index def8e2f..0000000 Binary files a/images/icon-dark-19.png and /dev/null differ diff --git a/images/icon-dark-32.png b/images/icon-dark-32.png deleted file mode 100644 index 2bc01ff..0000000 Binary files a/images/icon-dark-32.png and /dev/null differ diff --git a/images/icon-dark-38.png b/images/icon-dark-38.png deleted file mode 100644 index 2e08aec..0000000 Binary files a/images/icon-dark-38.png and /dev/null differ diff --git a/images/icon-dark-48.png b/images/icon-dark-48.png deleted file mode 100644 index f63956b..0000000 Binary files a/images/icon-dark-48.png and /dev/null differ diff --git a/images/icon-dark-64.png b/images/icon-dark-64.png deleted file mode 100644 index accf6a5..0000000 Binary files a/images/icon-dark-64.png and /dev/null differ diff --git a/images/icon-dark-theme-128.png b/images/icon-dark-theme-128.png new file mode 100644 index 0000000..002c9d5 Binary files /dev/null and b/images/icon-dark-theme-128.png differ diff --git a/images/icon-dark-theme-16.png b/images/icon-dark-theme-16.png new file mode 100644 index 0000000..23d6675 Binary files /dev/null and b/images/icon-dark-theme-16.png differ diff --git a/images/icon-dark-theme-19.png b/images/icon-dark-theme-19.png new file mode 100644 index 0000000..f5eaa06 Binary files /dev/null and b/images/icon-dark-theme-19.png differ diff --git a/images/icon-dark-theme-32.png b/images/icon-dark-theme-32.png new file mode 100644 index 0000000..28d2dc0 Binary files /dev/null and b/images/icon-dark-theme-32.png differ diff --git a/images/icon-dark-theme-38.png b/images/icon-dark-theme-38.png new file mode 100644 index 0000000..7e900ba Binary files /dev/null and b/images/icon-dark-theme-38.png differ diff --git a/images/icon-dark-theme-48.png b/images/icon-dark-theme-48.png new file mode 100644 index 0000000..e2826c4 Binary files /dev/null and b/images/icon-dark-theme-48.png differ diff --git a/images/icon-dark-theme-64.png b/images/icon-dark-theme-64.png new file mode 100644 index 0000000..97f057a Binary files /dev/null and b/images/icon-dark-theme-64.png differ diff --git a/images/icon-light-128.png b/images/icon-light-128.png deleted file mode 100644 index 002c9d5..0000000 Binary files a/images/icon-light-128.png and /dev/null differ diff --git a/images/icon-light-16.png b/images/icon-light-16.png deleted file mode 100644 index 23d6675..0000000 Binary files a/images/icon-light-16.png and /dev/null differ diff --git a/images/icon-light-19.png b/images/icon-light-19.png deleted file mode 100644 index f5eaa06..0000000 Binary files a/images/icon-light-19.png and /dev/null differ diff --git a/images/icon-light-32.png b/images/icon-light-32.png deleted file mode 100644 index 28d2dc0..0000000 Binary files a/images/icon-light-32.png and /dev/null differ diff --git a/images/icon-light-38.png b/images/icon-light-38.png deleted file mode 100644 index 7e900ba..0000000 Binary files a/images/icon-light-38.png and /dev/null differ diff --git a/images/icon-light-48.png b/images/icon-light-48.png deleted file mode 100644 index e2826c4..0000000 Binary files a/images/icon-light-48.png and /dev/null differ diff --git a/images/icon-light-64.png b/images/icon-light-64.png deleted file mode 100644 index 97f057a..0000000 Binary files a/images/icon-light-64.png and /dev/null differ diff --git a/images/icon-light-theme-128.png b/images/icon-light-theme-128.png new file mode 100644 index 0000000..5ef6a8b Binary files /dev/null and b/images/icon-light-theme-128.png differ diff --git a/images/icon-light-theme-16.png b/images/icon-light-theme-16.png new file mode 100644 index 0000000..9482d4b Binary files /dev/null and b/images/icon-light-theme-16.png differ diff --git a/images/icon-light-theme-19.png b/images/icon-light-theme-19.png new file mode 100644 index 0000000..def8e2f Binary files /dev/null and b/images/icon-light-theme-19.png differ diff --git a/images/icon-light-theme-32.png b/images/icon-light-theme-32.png new file mode 100644 index 0000000..2bc01ff Binary files /dev/null and b/images/icon-light-theme-32.png differ diff --git a/images/icon-light-theme-38.png b/images/icon-light-theme-38.png new file mode 100644 index 0000000..2e08aec Binary files /dev/null and b/images/icon-light-theme-38.png differ diff --git a/images/icon-light-theme-48.png b/images/icon-light-theme-48.png new file mode 100644 index 0000000..f63956b Binary files /dev/null and b/images/icon-light-theme-48.png differ diff --git a/images/icon-light-theme-64.png b/images/icon-light-theme-64.png new file mode 100644 index 0000000..accf6a5 Binary files /dev/null and b/images/icon-light-theme-64.png differ diff --git a/js/background.js b/js/background.js index 3c84b38..a3b5da3 100644 --- a/js/background.js +++ b/js/background.js @@ -29,12 +29,13 @@ var redirectThreshold = 3; function setIcon(image) { var data = { - path: { - 19 : 'images/' + image + '-19.png', - 38 : 'images/' + image + '-38.png' - } + path: {} }; + for (let nr of [16,19,32,38,48,64,128]) { + data.path[nr] = `images/${image}-${nr}.png`; + } + chrome.browserAction.setIcon(data, function() { var err = chrome.runtime.lastError; if (err) { @@ -201,12 +202,21 @@ function setUpRedirectListener() { function updateIcon() { chrome.storage.local.get({disabled:false}, function(obj) { - if (window.matchMedia('(prefers-color-scheme: dark)')) { - setIcon('icon-light'); + if (window.matchMedia('(prefers-color-scheme: dark)').matches) { + setIcon('icon-dark-theme'); } else { - setIcon('icon-dark'); + setIcon('icon-light-theme'); + } + + if (obj.disabled) { + chrome.browserAction.setBadgeText({text: 'off'}); + chrome.browserAction.setBadgeBackgroundColor({color: 'red'}); + if (chrome.browserAction.setBadgeTextColor) { //Not supported in Chrome + chrome.browserAction.setBadgeTextColor({color: '#fafafa'}); + } + } else { + chrome.browserAction.setBadgeText({text: ''}); } - //setIcon(obj.disabled ? 'icon-light' : 'icon-dark'); }); } @@ -410,4 +420,10 @@ function handleStartup(){ chrome.storage.local.set({ enableNotifications: false }); + + updateIcon(); //To set dark/light icon... + let mql = window.matchMedia('(prefers-color-scheme: dark)'); + mql.addEventListener('change', function(e) { + console.log('IT CHANGED ' + e.matches); + }); } \ No newline at end of file diff --git a/manifest.json b/manifest.json index b95744b..560d4c8 100644 --- a/manifest.json +++ b/manifest.json @@ -4,13 +4,13 @@ "description": "Automatically redirect content based on user-defined rules.", "version": "3.5", "icons": { - "16": "images/icon-dark-16.png", - "19": "images/icon-dark-19.png", - "32": "images/icon-dark-32.png", - "38": "images/icon-dark-38.png", - "48": "images/icon-dark-48.png", - "64": "images/icon-dark-64.png", - "128": "images/icon-dark-128.png" + "16": "images/icon-light-theme-16.png", + "19": "images/icon-light-theme-19.png", + "32": "images/icon-light-theme-32.png", + "38": "images/icon-light-theme-38.png", + "48": "images/icon-light-theme-48.png", + "64": "images/icon-light-theme-64.png", + "128": "images/icon-light-theme-128.png" }, "permissions": [ "webRequest", @@ -39,50 +39,50 @@ }, "browser_action": { "default_icon": { - "16": "images/icon-dark-16.png", - "19": "images/icon-dark-19.png", - "32": "images/icon-dark-32.png", - "38": "images/icon-dark-38.png", - "48": "images/icon-dark-48.png", - "64": "images/icon-dark-64.png", - "128": "images/icon-dark-128.png" + "16": "images/icon-light-theme-16.png", + "19": "images/icon-light-theme-19.png", + "32": "images/icon-light-theme-32.png", + "38": "images/icon-light-theme-38.png", + "48": "images/icon-light-theme-48.png", + "64": "images/icon-light-theme-64.png", + "128": "images/icon-light-theme-128.png" }, "default_title": "Redirector", "default_popup": "popup.html", "theme_icons": [ { - "light": "images/icon-dark-16.png", - "dark": "images/icon-light-16.png", + "light": "images/icon-light-theme-16.png", + "dark": "images/icon-dark-theme-16.png", "size": 16 }, { - "light": "images/icon-dark-19.png", - "dark": "images/icon-light-19.png", + "light": "images/icon-light-theme-19.png", + "dark": "images/icon-dark-theme-19.png", "size": 19 }, { - "light": "images/icon-dark-32.png", - "dark": "images/icon-light-32.png", + "light": "images/icon-light-theme-32.png", + "dark": "images/icon-dark-theme-32.png", "size": 32 }, { - "light": "images/icon-dark-38.png", - "dark": "images/icon-light-38.png", + "light": "images/icon-light-theme-38.png", + "dark": "images/icon-dark-theme-38.png", "size": 38 }, { - "light": "images/icon-dark-48.png", - "dark": "images/icon-light-48.png", + "light": "images/icon-light-theme-48.png", + "dark": "images/icon-dark-theme-48.png", "size": 48 }, { - "light": "images/icon-dark-64.png", - "dark": "images/icon-light-64.png", + "light": "images/icon-light-theme-64.png", + "dark": "images/icon-dark-theme-64.png", "size": 64 }, { - "light": "images/icon-dark-128.png", - "dark": "images/icon-light-128.png", + "light": "images/icon-light-theme-128.png", + "dark": "images/icon-dark-theme-128.png", "size": 128 } ] -- cgit v1.2.3