diff --git a/pkg/extension/src/images/extension/icon-128.png b/pkg/extension/src/images/extension/icon-128.png index 7608e31eb..d6df58ae7 100644 Binary files a/pkg/extension/src/images/extension/icon-128.png and b/pkg/extension/src/images/extension/icon-128.png differ diff --git a/pkg/extension/src/images/extension/icon-16.png b/pkg/extension/src/images/extension/icon-16.png index 26d201618..5c0b8ad30 100644 Binary files a/pkg/extension/src/images/extension/icon-16.png and b/pkg/extension/src/images/extension/icon-16.png differ diff --git a/pkg/extension/src/images/extension/icon-24.png b/pkg/extension/src/images/extension/icon-24.png index 218786d43..a0654130b 100644 Binary files a/pkg/extension/src/images/extension/icon-24.png and b/pkg/extension/src/images/extension/icon-24.png differ diff --git a/pkg/extension/src/images/extension/icon-256.png b/pkg/extension/src/images/extension/icon-256.png index 36840b8af..a4413ba25 100644 Binary files a/pkg/extension/src/images/extension/icon-256.png and b/pkg/extension/src/images/extension/icon-256.png differ diff --git a/pkg/extension/src/images/extension/icon-32.png b/pkg/extension/src/images/extension/icon-32.png index e599d94e2..2270c0762 100644 Binary files a/pkg/extension/src/images/extension/icon-32.png and b/pkg/extension/src/images/extension/icon-32.png differ diff --git a/pkg/extension/src/images/extension/icon-48.png b/pkg/extension/src/images/extension/icon-48.png index 568703dfc..dda13bd4e 100644 Binary files a/pkg/extension/src/images/extension/icon-48.png and b/pkg/extension/src/images/extension/icon-48.png differ diff --git a/pkg/extension/src/images/extension/icon-96.png b/pkg/extension/src/images/extension/icon-96.png index 8c1aa4123..3af64b0be 100644 Binary files a/pkg/extension/src/images/extension/icon-96.png and b/pkg/extension/src/images/extension/icon-96.png differ diff --git a/pkg/extension/src/images/toolbar/icon-16.png b/pkg/extension/src/images/toolbar/icon-16.png deleted file mode 100644 index 8af894339..000000000 Binary files a/pkg/extension/src/images/toolbar/icon-16.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon-19.png b/pkg/extension/src/images/toolbar/icon-19.png deleted file mode 100644 index a162b7259..000000000 Binary files a/pkg/extension/src/images/toolbar/icon-19.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon-24.png b/pkg/extension/src/images/toolbar/icon-24.png deleted file mode 100644 index 0cc823c29..000000000 Binary files a/pkg/extension/src/images/toolbar/icon-24.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon-32.png b/pkg/extension/src/images/toolbar/icon-32.png deleted file mode 100644 index ae41ae57b..000000000 Binary files a/pkg/extension/src/images/toolbar/icon-32.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon-38.png b/pkg/extension/src/images/toolbar/icon-38.png deleted file mode 100644 index 3a3ecf52d..000000000 Binary files a/pkg/extension/src/images/toolbar/icon-38.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon-48.png b/pkg/extension/src/images/toolbar/icon-48.png deleted file mode 100644 index 8452adade..000000000 Binary files a/pkg/extension/src/images/toolbar/icon-48.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_dark-16.png b/pkg/extension/src/images/toolbar/icon_dark-16.png deleted file mode 100644 index 187cd66f5..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_dark-16.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_dark-19.png b/pkg/extension/src/images/toolbar/icon_dark-19.png deleted file mode 100644 index 6f7b1847f..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_dark-19.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_dark-24.png b/pkg/extension/src/images/toolbar/icon_dark-24.png deleted file mode 100644 index 8df374a15..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_dark-24.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_dark-32.png b/pkg/extension/src/images/toolbar/icon_dark-32.png deleted file mode 100644 index b973cfd75..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_dark-32.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_dark-38.png b/pkg/extension/src/images/toolbar/icon_dark-38.png deleted file mode 100644 index 21c68f3a8..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_dark-38.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_dark-48.png b/pkg/extension/src/images/toolbar/icon_dark-48.png deleted file mode 100644 index 4b78bd06a..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_dark-48.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge-16.png b/pkg/extension/src/images/toolbar/icon_edge-16.png deleted file mode 100644 index a214de8c1..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge-16.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge-24.png b/pkg/extension/src/images/toolbar/icon_edge-24.png deleted file mode 100644 index 6530b0436..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge-24.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge-32.png b/pkg/extension/src/images/toolbar/icon_edge-32.png deleted file mode 100644 index 2f05b48ec..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge-32.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge-48.png b/pkg/extension/src/images/toolbar/icon_edge-48.png deleted file mode 100644 index 0b251b106..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge-48.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_dark-16.png b/pkg/extension/src/images/toolbar/icon_edge_dark-16.png deleted file mode 100644 index 7c412d031..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_dark-16.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_dark-24.png b/pkg/extension/src/images/toolbar/icon_edge_dark-24.png deleted file mode 100644 index b24a06597..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_dark-24.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_dark-32.png b/pkg/extension/src/images/toolbar/icon_edge_dark-32.png deleted file mode 100644 index 2bd788355..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_dark-32.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_dark-48.png b/pkg/extension/src/images/toolbar/icon_edge_dark-48.png deleted file mode 100644 index dba76c689..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_dark-48.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_inactive-16.png b/pkg/extension/src/images/toolbar/icon_edge_inactive-16.png deleted file mode 100644 index cab80e160..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_inactive-16.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_inactive-24.png b/pkg/extension/src/images/toolbar/icon_edge_inactive-24.png deleted file mode 100644 index 43ee51057..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_inactive-24.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_inactive-32.png b/pkg/extension/src/images/toolbar/icon_edge_inactive-32.png deleted file mode 100644 index d04ebe178..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_inactive-32.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_inactive-48.png b/pkg/extension/src/images/toolbar/icon_edge_inactive-48.png deleted file mode 100644 index 4f99f32d3..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_inactive-48.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-16.png b/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-16.png deleted file mode 100644 index f2896afb7..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-16.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-24.png b/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-24.png deleted file mode 100644 index c25eb9ec7..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-24.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-32.png b/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-32.png deleted file mode 100644 index 63325a4f2..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-32.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-48.png b/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-48.png deleted file mode 100644 index c92d48723..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_edge_inactive_dark-48.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_firefox.svg b/pkg/extension/src/images/toolbar/icon_firefox.svg deleted file mode 100644 index 1917916ce..000000000 --- a/pkg/extension/src/images/toolbar/icon_firefox.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/pkg/extension/src/images/toolbar/icon_firefox_dark.svg b/pkg/extension/src/images/toolbar/icon_firefox_dark.svg deleted file mode 100644 index 49dcf5e8b..000000000 --- a/pkg/extension/src/images/toolbar/icon_firefox_dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/pkg/extension/src/images/toolbar/icon_firefox_inactive.svg b/pkg/extension/src/images/toolbar/icon_firefox_inactive.svg deleted file mode 100644 index 49dcf5e8b..000000000 --- a/pkg/extension/src/images/toolbar/icon_firefox_inactive.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/pkg/extension/src/images/toolbar/icon_firefox_inactive_dark.svg b/pkg/extension/src/images/toolbar/icon_firefox_inactive_dark.svg deleted file mode 100644 index 49dcf5e8b..000000000 --- a/pkg/extension/src/images/toolbar/icon_firefox_inactive_dark.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/pkg/extension/src/images/toolbar/icon_inactive-16.png b/pkg/extension/src/images/toolbar/icon_inactive-16.png deleted file mode 100644 index 6dc495ab5..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive-16.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive-19.png b/pkg/extension/src/images/toolbar/icon_inactive-19.png deleted file mode 100644 index 9291dfd5f..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive-19.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive-24.png b/pkg/extension/src/images/toolbar/icon_inactive-24.png deleted file mode 100644 index 10962350d..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive-24.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive-32.png b/pkg/extension/src/images/toolbar/icon_inactive-32.png deleted file mode 100644 index 118629ee5..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive-32.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive-38.png b/pkg/extension/src/images/toolbar/icon_inactive-38.png deleted file mode 100644 index 8cc56b267..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive-38.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive-48.png b/pkg/extension/src/images/toolbar/icon_inactive-48.png deleted file mode 100644 index 67c406e52..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive-48.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive_dark-16.png b/pkg/extension/src/images/toolbar/icon_inactive_dark-16.png deleted file mode 100644 index 4912800b8..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive_dark-16.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive_dark-19.png b/pkg/extension/src/images/toolbar/icon_inactive_dark-19.png deleted file mode 100644 index 8c41a8b7f..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive_dark-19.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive_dark-24.png b/pkg/extension/src/images/toolbar/icon_inactive_dark-24.png deleted file mode 100644 index ff2eb0de0..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive_dark-24.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive_dark-32.png b/pkg/extension/src/images/toolbar/icon_inactive_dark-32.png deleted file mode 100644 index 26f0d3f06..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive_dark-32.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive_dark-38.png b/pkg/extension/src/images/toolbar/icon_inactive_dark-38.png deleted file mode 100644 index 9720efa04..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive_dark-38.png and /dev/null differ diff --git a/pkg/extension/src/images/toolbar/icon_inactive_dark-48.png b/pkg/extension/src/images/toolbar/icon_inactive_dark-48.png deleted file mode 100644 index 8670b05eb..000000000 Binary files a/pkg/extension/src/images/toolbar/icon_inactive_dark-48.png and /dev/null differ diff --git a/pkg/extension/src/manifest.json b/pkg/extension/src/manifest.json index ff7ac23eb..d2aee9c93 100644 --- a/pkg/extension/src/manifest.json +++ b/pkg/extension/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "process.env.EXTENSION_NAME", "short_name": "process.env.EXTENSION_NAME", - "version": "2.2.1", + "version": "2.4.2", "description": "Save PDFs and Articles to your Omnivore library", "author": "Omnivore Media, Inc", "default_locale": "en", @@ -75,12 +75,12 @@ ], "browser_action": { "default_icon": { - "16": "/images/toolbar/icon-16.png", - "19": "/images/toolbar/icon-19.png", - "24": "/images/toolbar/icon-24.png", - "32": "/images/toolbar/icon-32.png", - "38": "/images/toolbar/icon-38.png", - "48": "/images/toolbar/icon-48.png" + "16": "/images/extension/icon-16.png", + "19": "/images/extension/icon-19.png", + "24": "/images/extension/icon-24.png", + "32": "/images/extension/icon-32.png", + "38": "/images/extension/icon-38.png", + "48": "/images/extension/icon-48.png" }, "default_title": "Omnivore Save Article" }, diff --git a/pkg/extension/src/scripts/background.js b/pkg/extension/src/scripts/background.js index 9f220da4d..3bb5fd6fb 100644 --- a/pkg/extension/src/scripts/background.js +++ b/pkg/extension/src/scripts/background.js @@ -603,6 +603,7 @@ function handleActionClick() { function executeAction(action) { getCurrentTab().then((currentTab) => { + console.log('currentTab: ', currentTab) browserApi.tabs.sendMessage( currentTab.id, { @@ -637,49 +638,6 @@ function executeAction(action) { }) } -function getIconPath(active, dark) { - let iconPath = '/images/toolbar/icon' - if (ENV_IS_FIREFOX) { - iconPath += '_firefox' - } else if (ENV_IS_EDGE) { - iconPath += '_edge' - } - if (!active) { - iconPath += '_inactive' - } - /* we have to evaluate this every time as the onchange is not - * fired inside background pages, due to https://crbug.com/968651 */ - const useDarkIcon = - typeof dark === 'boolean' - ? dark - : window.matchMedia('(prefers-color-scheme: dark)').matches - - if (useDarkIcon) { - iconPath += '_dark' - } - if (ENV_IS_FIREFOX) { - return iconPath + '.svg' - } - - const iconSizes = ['16', '24', '32', '48'] - if (!ENV_IS_EDGE) { - iconSizes.push('19', '38') - } - const iconPaths = {} - for (let i = 0; i < iconSizes.length; i++) { - const iconSize = iconSizes[i] - iconPaths[iconSize] = iconPath + '-' + iconSize + '.png' - } - return iconPaths -} - -function updateActionIcon(tabId, active, dark) { - browserActionApi.setIcon({ - path: getIconPath(active, dark), - tabId: tabId, - }) -} - function getActionableState(tab) { if (tab.status !== 'complete') return false @@ -698,17 +656,7 @@ function getActionableState(tab) { return true } -function reflectIconState(tab) { - const tabId = tab && tab.id - if (!tabId) return - - const active = getActionableState(tab) - - updateActionIcon(tabId, active) -} - function init() { - /* Extension icon switcher on page/tab load status */ browserApi.tabs.onActivated.addListener(({ tabId }) => { // Due to a chrome bug, chrome.tabs.* may run into an error because onActivated is triggered too fast. function checkCurrentTab() { @@ -716,21 +664,11 @@ function init() { if (browserApi.runtime.lastError) { setTimeout(checkCurrentTab, 150) } - reflectIconState(tab) }) } - checkCurrentTab() }) - /* Extension icon switcher on page/tab load status */ - browserApi.tabs.onUpdated.addListener((tabId, changeInfo, tab) => { - /* Not an update while this tab is active so we skip updating icon */ - if (!changeInfo.status || !tab || !tab.active) return - - reflectIconState(tab) - }) - browserApi.tabs.onRemoved.addListener((tabId) => { /* cleanup any previous saveInProgress state for the tab */ cleanupTabState(tabId) @@ -746,10 +684,6 @@ function init() { return } - if (request.action === ACTIONS.RefreshDarkMode) { - updateActionIcon(sender.tab.id, request.payload.value) - } - if (request.action === ACTIONS.EditTitle) { pendingRequests.push({ id: uuidv4(), @@ -808,25 +742,9 @@ function init() { } }) - // set initial extension icon - browserActionApi.setIcon({ - path: getIconPath(true), - }) - browserApi.contextMenus.create({ id: 'save-selection', - title: 'Save link to Omnivore', - contexts: ['link'], - onclick: async function (obj) { - executeAction(async function (currentTab) { - await saveUrl(currentTab, obj.linkUrl) - }) - }, - }) - - browserApi.contextMenus.create({ - id: 'save-selection', - title: 'Save link to Omnivore', + title: 'Save this link to Omnivore', contexts: ['link'], onclick: async function (obj) { executeAction(async function (currentTab) {