From a850736a2f98e951e9bc673b9260ef57a6865671 Mon Sep 17 00:00:00 2001
From: Jan Christoph Ebersbach <jan-christoph.ebersbach@identinet.io>
Date: Wed, 7 Feb 2024 10:33:08 +0100
Subject: [PATCH] feat: move action icon into URL bar

---
 background.js                  |  16 ++++++++++++----
 manifest/manifest_chrome.json  |  10 +++++++++-
 manifest/manifest_firefox.json |   9 +++++++++
 manifest/manifest_shared.json  |   5 -----
 public/icons/favicon_19.png    | Bin 0 -> 884 bytes
 public/icons/favicon_38.png    | Bin 0 -> 1755 bytes
 6 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 public/icons/favicon_19.png
 create mode 100644 public/icons/favicon_38.png

diff --git a/background.js b/background.js
index b00d997..3a3e3e7 100644
--- a/background.js
+++ b/background.js
@@ -30,10 +30,18 @@ const fetchPath = (pathname) => (url) => {
  * @returns {number} Tab number.
  */
 const setIcon = (tabId) => (path) => {
-  api.action.setIcon({
-    path: path,
-    tabId,
-  });
+  if (!api.pageAction) {
+    // Chrome doesn't support page actions
+    api.action.setIcon({
+      path: path,
+      tabId,
+    });
+  } else {
+    api.pageAction.setIcon({
+      path: path,
+      tabId,
+    });
+  }
   return tabId;
 };
 
diff --git a/manifest/manifest_chrome.json b/manifest/manifest_chrome.json
index c399497..7e4d347 100644
--- a/manifest/manifest_chrome.json
+++ b/manifest/manifest_chrome.json
@@ -1,7 +1,15 @@
 {
+  "author": {
+    "email": "janchristoph.ebersbach@gmail.com"
+  },
   "background": {
     "service_worker": "background.js",
     "type": "module"
   },
-  "minimum_chrome_version": "92"
+  "minimum_chrome_version": "92",
+  "action": {
+    "default_title": "identinet Decentralized Identity Information",
+    "default_popup": "index.html",
+    "default_icon": "icons/favicon_48.png"
+  }
 }
diff --git a/manifest/manifest_firefox.json b/manifest/manifest_firefox.json
index dc05b04..ee7db96 100644
--- a/manifest/manifest_firefox.json
+++ b/manifest/manifest_firefox.json
@@ -7,5 +7,14 @@
       "id": "extension@identinet.io",
       "strict_min_version": "109.0"
     }
+  },
+  "page_action": {
+    "default_title": "identinet Decentralized Identity Information",
+    "default_popup": "index.html",
+    "default_icon": {
+      "19": "icons/favicon_19.png",
+      "38": "icons/favicon_38.png"
+    },
+    "show_matches": ["https://*/*"]
   }
 }
diff --git a/manifest/manifest_shared.json b/manifest/manifest_shared.json
index 26cdf71..7836778 100644
--- a/manifest/manifest_shared.json
+++ b/manifest/manifest_shared.json
@@ -11,11 +11,6 @@
     "96": "icons/favicon_96.png",
     "128": "icons/favicon_128.png"
   },
-  "action": {
-    "default_title": "identinet Decentralized Identity Information",
-    "default_popup": "index.html",
-    "default_icon": "icons/favicon_48.png"
-  },
   "permissions": [
     "activeTab",
     "tabs",
diff --git a/public/icons/favicon_19.png b/public/icons/favicon_19.png
new file mode 100644
index 0000000000000000000000000000000000000000..35dbecaf01a309ad40a3f6562c550e79a8df6bd6
GIT binary patch
literal 884
zcmV-)1B?8LP)<h;3K|Lk000e1NJLTq000vJ000vR1^@s6a!@wR00009a7bBm0009Z
z0009Z0ZZeP^Z)<=8FWQhbW?9;ba!ELWdL_~cP?peYja~^aAhuUa%Y?FJQ@H10|7}y
zK~y-6g_BK8TxAr7pL1t$E(4bKila_4R4biDgD#3FipHPNkZ9Vnansnab<yZr6InEB
z;?GWvi>5BDSYu+0iUb#mg-9(nP#{7kC|wk4b*6QY$z^6>=5;aL3AO{iyYHOyJ?G^7
z7&RoR1vmyg2iy<b0c3zh;9Fq8%&ye>yA|R}dRJ0jJ8MnS+mhVvKru-_2hmfRqRuS%
zx|lBR1U)Y)7BDQR2p9o61-v+x<#fugCOW=9%12M`t_0tz^T5+)R&X{AuLGR`pZ~tb
z>6A}2Y#iO|(hxSzEckq~;MYdMqrgc3XS3NS0?!Xu3jn-!@OHj9<Z<$$T>yN)T-d(Z
z@RFp21H1r40;?CP6np9VI{&PTsZ0@oJrSoCB#;XnGf88><AHT9yFtg7X$mD(BX4tz
z3%$)e;MMH}9Cd)!t(F73!+g`@@t{{nony3lb$r$1{T~RR6-kAg=Upt7_2FDjuUuHs
z2fyZ2D3v8iGcz-aMx%0FSIy1M>g(%ME|&|w<-@>r;GO`#QY>@$yBm!ES*)h~^tUy>
z?(tY!TEh2z1_uXOTwJ8Tzn{s;Nv5Z#F|!Pk#<o`V@_1IEQ_H&V>@^)9xuJb$uPJnD
zStowVYG`OkfPCMVB&AX*nVCjMM<wZ;L*>@0I`>Br1K#Y|#m7(W;hjgCa14IDdh2Q=
zlSvvI8=07x02p+D0U!^M&X>8ox<R}l#Pj>=0qDKgCD9P#@@k26zWg6pHk-xweUiy!
z5%|p6y#Dt9rZVf~)<v`H5Zb&Q$KcL-hkQvatZY;v^Yim`cX!j&)I?WT*ZXF6CA^uW
zA9!MQz1#_vz1phatw<Drcsve3OG^vG!^4+6&wCXh3}9w?Nk<*C5#Yc!d&K_s$C#a+
zrBEo4NF<2GV&g!snH2!4H)3Xg)kXg9II`FMCG1$a7R=0OYipyuy*(d`#ohv*F|%~w
z4{r@V9FP0J!*5*79s~{n&jPJsv%BxA56KNNM`d6GX0~*5vVQ@#XRA!Aw8iEC0000<
KMNUMnLSTYH#hcgw

literal 0
HcmV?d00001

diff --git a/public/icons/favicon_38.png b/public/icons/favicon_38.png
new file mode 100644
index 0000000000000000000000000000000000000000..9d866421105e3dcd5aaddd6ef192b05f25481319
GIT binary patch
literal 1755
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

literal 0
HcmV?d00001