From 77505e3c752e13ed9fe2e85db0d3bef44f267651 Mon Sep 17 00:00:00 2001 From: Laurent Cozic Date: Mon, 5 Jun 2023 17:15:24 +0100 Subject: [PATCH] Revert "Android: Fixes #7766: Support monochrome icons (#7772)" This reverts commit fd578d1c365abc21e143bae9527f09cf7bbf75ad. Ref: https://github.com/laurent22/joplin/issues/8273 --- Assets/ImageSources/JoplinIconForeground.svg | 78 ------ .../ImageSources/JoplinNotificationIcon.svg | 1 - package.json | 1 - .../drawable-anydpi-v24/ic_notification.xml | 9 - .../res/drawable-hdpi/ic_notification.png | Bin 568 -> 0 bytes .../res/drawable-mdpi/ic_notification.png | Bin 421 -> 0 bytes .../res/drawable-xhdpi/ic_notification.png | Bin 697 -> 0 bytes .../res/drawable-xxhdpi/ic_notification.png | Bin 1045 -> 0 bytes .../res/drawable/ic_launcher_foreground.png | Bin 0 -> 13531 bytes .../res/drawable/ic_launcher_foreground.xml | 15 -- .../res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- .../mipmap-hdpi/ic_launcher_foreground.png | Bin 0 -> 1045 bytes .../mipmap-mdpi/ic_launcher_foreground.png | Bin 0 -> 725 bytes .../mipmap-xhdpi/ic_launcher_foreground.png | Bin 0 -> 1395 bytes .../mipmap-xxhdpi/ic_launcher_foreground.png | Bin 0 -> 2286 bytes .../mipmap-xxxhdpi/ic_launcher_foreground.png | Bin 0 -> 3251 bytes .../services/AlarmServiceDriver.android.ts | 3 +- .../android/src/main/AndroidManifest.xml | 1 - .../react/alarm/notification/AlarmModel.java | 4 +- .../alarm/notification/AlarmReceiver.java | 3 +- .../react/alarm/notification/AlarmUtil.java | 51 ++-- packages/tools/generate-images.json | 6 +- packages/tools/generate-images.ts | 59 ----- packages/tools/package.json | 1 - yarn.lock | 226 +----------------- 26 files changed, 39 insertions(+), 427 deletions(-) delete mode 100644 Assets/ImageSources/JoplinIconForeground.svg delete mode 100644 Assets/ImageSources/JoplinNotificationIcon.svg delete mode 100644 packages/app-mobile/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml delete mode 100644 packages/app-mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png delete mode 100644 packages/app-mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png delete mode 100644 packages/app-mobile/android/app/src/main/res/drawable-xhdpi/ic_notification.png delete mode 100644 packages/app-mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png create mode 100644 packages/app-mobile/android/app/src/main/res/drawable/ic_launcher_foreground.png delete mode 100644 packages/app-mobile/android/app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 packages/app-mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png create mode 100644 packages/app-mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png create mode 100644 packages/app-mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png create mode 100644 packages/app-mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png create mode 100644 packages/app-mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png diff --git a/Assets/ImageSources/JoplinIconForeground.svg b/Assets/ImageSources/JoplinIconForeground.svg deleted file mode 100644 index aab92f3113..0000000000 --- a/Assets/ImageSources/JoplinIconForeground.svg +++ /dev/null @@ -1,78 +0,0 @@ - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - diff --git a/Assets/ImageSources/JoplinNotificationIcon.svg b/Assets/ImageSources/JoplinNotificationIcon.svg deleted file mode 100644 index 9f263309ba..0000000000 --- a/Assets/ImageSources/JoplinNotificationIcon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/package.json b/package.json index 4f03dc5037..5a15242f6d 100644 --- a/package.json +++ b/package.json @@ -84,7 +84,6 @@ "lint-staged": "13.2.2", "madge": "6.0.0", "npm-package-json-lint": "6.4.0", - "svg2vectordrawable": "^2.9.1", "typedoc": "0.17.8", "typescript": "4.9.5" }, diff --git a/packages/app-mobile/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/packages/app-mobile/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml deleted file mode 100644 index 307d85a37f..0000000000 --- a/packages/app-mobile/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/packages/app-mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png b/packages/app-mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png deleted file mode 100644 index b9b2e87af3dfdc404e5bd8120213a0f4bf5054b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 568 zcmV-80>}M{P)PbXFRCwC$m^&{-K@`V_B`DB}5QT&&gh;UA1L!n%5iM$kLZeU; zkIHxODkTaMm5xNRR%g8mB#5B!2!1j$WOL2EJ9l^X?n?ZV?PkyU?Rm_eGeS57gn$8H z4LAj!u_tNk1Xxu*Lc&Wx7jQ^$iUVOcn10LAFx3+f(M2W~Fv(Eie-S!DrvY z#=%!j0fQEP;e{|1@Zw=7DpWV+3(&Gqt(`AG$HG!EzXDt8eyP9()2V z*aT|OI9SRh(1^x?EaFR-^P`&ci#CCFUAn9R*m0aa0?IXKH*H^xLoQGSK&y?6!rlOlA`Jmke)cn=c5M@#15G|*y8T24NC-8Uo9a=eCu9KA3*7mfCcf67 zfixcp#(+8pL>bVdHjIxn>_)#=>39Z%+AR+*w3U$Eq%u diff --git a/packages/app-mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png b/packages/app-mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png deleted file mode 100644 index 57d55b2f0cf6e570871d94893946d33f4b927d45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 421 zcmV;W0b2fvP)@0GogBr*sqa9q zf1m{yN8dm}uoYZfdUrv4}QIrUu zu!3XUYG1d>+$GebP#DCy>U4%i_~ccFhmd*}cg9|?4Dcfe=)x8*v0D{jCJ2})*hRf%0N;Xu;kN*6r)s~N8ea>>`pW?B zF_eOQ#X7#nEk3wERRqXuc1QRewGcY6*CPL>s9m36Bquy>az6_`)aQ1+RA73*4(9L$ z<7nc~E80sl2Go<|t!ka3_OjeY#gNl~hkj7gcqNN*-TvdZonumqH-yh`%F#D5L}Z9!52r-5nQ(HzjOYyJjM#yts7 zeR1X=;l3uK%-_Zz-3*&=2ev!{DDTs{mDi{~X{@6(Gan?JKbC3&1uo3tRz?hD_B07hDGT40Ohn1TC%tya4Jn zY8od2-s_l82yoaIz()94_YGhqVOgvT&|nMTgu?7`U=(-<%mWXAOD^4krI;&SG)QDt z?!b%!;GtnAwgND%0C?^Lz^nq`z7GID6aa0qtVj#cXe$b}8192}5p$bt0o+vp)Bsb8 zxnF?&5pz3j0sI6G#3Zka|LARg0y-3PuG_4I#x%2VGjJ9-sWCQh0+6(^C7Mn>K}G_) zGy_0nV=GN-Q51Du8JMpF77gA>ezz7EQchk6E*qHN2fQ?VBb*Q9QKpF|fg=gcACm>2 zsRnkEkg3*XHqONu7xDfcu$EC1p>=2BHyL&&L|5V&Fer~~`+;%bL&oQDufiwtE}jiX zsr={a?}E7H5kPO$Gdkgc`SG|2A&xmW9er&2bi>>!xe;B_T-vWzax$9aWyZGkxlKXl fiNU`%Ye>HU#w%R1IUGn#00000NkvXXu0mjfJ&+`| diff --git a/packages/app-mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png b/packages/app-mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png deleted file mode 100644 index 9dc753ac6212c19e3750fa104a0e5608742c4fa4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1045 zcmV+w1nT>VP)ZFTG8*)Ac$HNWkzKgwFum_i-H!d zB!WmPZ4pS;#`+7)MZY#hE&6RywCNXRzo2FGJA+C=&5fFU;>aju?>%Skz4N^9-uc2? zzPWQgckawNXJ$?!VIUw6*aRE{?f@TwF2XD6+Xvvb>T{*okO*49G@t=!Bm32+Y$*-` z%y^&<_(k+2HXRZhy~0@lJR$me4lFW-QwIDbKI#D0>B3n9^bkLZ&E=!PDFxbzujH#) zm~KLD#p!9%i5ocV*bM7nGC!v$B=bNs&=k<`EbzxeKf3?%la!Yk2EDZ4{yNj>hogo>?jfRbv1G;rJjO7oeisN4Zcu3HI}4sd{y>s=ybk$Q*n$0UPL3seC) zhS`Vh>i_aP0{r%qPm)FlLhiJkFaUHd;AamcvcRkTrU|Feqf?kx*#M|R6VOZ>4|jkZ zAP2|+a)2D5i~ySD0Hp^s+W~Tb93WAj${;*fI|y%p?{Nq8Q0;@S0P<59SPUG98=y-9 z#UL7A85cmGfh``ATYdn|$reBlfEgaMe~||yaHjZ3k475MTS;2^%pdy!G&jtEByC$3 zK!QE8Bj{8>I}ni^K{9$4J3y&*&k%xq3j2YJz+H8kV~etyCR$Ib-aRk(>+4%_>$Op{}>nAoz(|}KL1++xd zfabUY+OBE9GLJ`5bOFr|E1)I=Kd8||`(LviP`klAB&*qV!}f1zw!JFM!Rl^3rl9&Q|QH%ho~i#tgxk zZuubm;6d`+mKv9(yuc!y0v{<9UEQ>OS4@`w5=$fJKK3G{m=-sYIe4{6d7K|Hf+JT!*P8krlH+|8130o`mij5tbwDk}QIjm?H7O@# zLr_H$mt@ezx9uU<|L5lf6bDJ2j|~b|3-DfL62q!a)yEdq=ZfL*K~sMLrwrNi+C@7! P00000NkvXXu0mjfhJoH3 diff --git a/packages/app-mobile/android/app/src/main/res/drawable/ic_launcher_foreground.png b/packages/app-mobile/android/app/src/main/res/drawable/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..e673f82e1e77c22828a1ca4700908492da7e5d80 GIT binary patch literal 13531 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 - - - - diff --git a/packages/app-mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/packages/app-mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6c84555ff4..ca053fb6b8 100644 --- a/packages/app-mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/packages/app-mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,6 @@ - - + + diff --git a/packages/app-mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/packages/app-mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6c84555ff4..ca053fb6b8 100644 --- a/packages/app-mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/packages/app-mobile/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,6 @@ - - + + diff --git a/packages/app-mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/packages/app-mobile/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..a884bbbd0e724eff5b380f0432cad25749fd8418 GIT binary patch literal 1045 zcmeAS@N?(olHy`uVBq!ia0vp^i$Iuz4M-mPBqq(kzPUS{l3pRyElKo7s+L>H_j9S+KLk#2*{fC zY~qZIg|pVrEzA>plzjGwWa%+MB_|OjCzlQ&;t1^Em}qTuWTxTyV>Z*%bI+VM+`pwK z&;QJ>Y&r9@TIq8(vRTndjsXrU)u>2`VbN zC>E)=SRB3S+`(ZO(G!XGGd|+&^d_w3a`L|% z!TT>~Oi!8?6KgoP>_ykix!+yxO#9y}ursy8e@ll!?G@wY?a6m!H-~iG(V7&_t?Z*+ zuq>>K&q*ZdbLK;-p~{hNpt&9U#auSTc3k26=;O#TyVc{Z zfOpx~`-(1E?G-B&nrfYvly%69yG#&szhiw+@t^XMyw)9CKNKI~by||vvGo3$o@>8W z&&UrHeKeunLRmjd<6~lPd|lV^haGHmUeLCeNEeW+SkuYTsL|9SLSnwe!kMBTSsSH zkCMq=yZYK$f#o844Lc@2u3SH7>2-b4)7)vnYwmBU__O8LZ^!VpyAADTO|Q86CH&0A zKfLEo?x|V5_V2o|@5wcLC2Lm4u6)-%!z}(+QG@cIeIK)#oP{6P8mhAy9QqP?@$tF~ z1xJ4rJY00MuIl$?Lm#tTho%*o1(D6*TuuS5w^B)>kD;_I}|1|sY2Hlgr zGM$l6v@wn+^hfq literal 0 HcmV?d00001 diff --git a/packages/app-mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/packages/app-mobile/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..beaf0853904eff24fbff7029b2c30d2c8c254e09 GIT binary patch literal 725 zcmeAS@N?(olHy`uVBq!ia0vp^IUvlz1|<8_!p|}=FwOCFaSW-r^>)r)@2QD0ZJ`3H zP8^4&Tv!SURuu%m2>&UO;Hy{^ynUt*@J^Kg~(svHtMu&!v8`vOvqQg9-uH!0kc7X2L<LGLufrzkfb zV#_qQ_RO>Y&|J`X4x$ykY}m z6#w+nn4hv0K|LFqQr`yKEw#Ai9&zx{yCr+N8#geeZauQSsP@LKZ~OTYS-GT5y?(8V z3ATD<8nrmuK-+vudgGyAh7a`LEL?cQbg6dxTFn+#j%WjsYQyDwU0PU0cBg4<<4wFO z80M{U)mKldNT`gB`QOnx6Or3}8(wi#Cu@AOIkZaoP2<8FuJ?~G`uI%$5K{}U)b+&2 z^B((2AG7IYtWT_-nt$wWuifJryr-%U&p2)%pq6_n**nYT<;NBKR*!N|&q5`j4Gw<=E|g`=+P$s+yC5*EY?bd8uUErK&sUIi4z{}^(`tef{duhrp+e4T$rM`~(pHp|Jk o=xG|C3jJ<%iwS$$U|_h>xqq{rT$xPjgk>Nlp00i_>zopr09%MQv;Y7A literal 0 HcmV?d00001 diff --git a/packages/app-mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/packages/app-mobile/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..9322dd4164c42b089e88fb1188119135d36c981b GIT binary patch literal 1395 zcmb7^eLT|%9LL=@4|%Fy9@JVc)JG?l5f9Ab2iNS<1b<(aG1Jgik3 zhcJ?(HCxfv)lZaTv)vLhqiG5$-MD%6*ZtY|^?i8%@%?;1|9$fh`+FMbn(1n2Xc%}M zat~5Z(OT(fse8WF&RGo&O{|x@OUOC#tkg>$8oHU6*at83fTL`C3z7pNfrYkLOgqYc zt34R$eyHqT>#aXbWsm&2o{+5CObw!#rY6+GF}8lt-9g_UoE)$*gPSjYbUfEHrdfME z{S|vD(|N9^SUyRgpIlw#uCk{}px>!&zcs$pG&IZ;F#?h_zGETrc&lA9ob{~nVcX*d zD+HO$J3s)r5kO!yLGpMIEj6vvSLX-q6jxxJmcCTUL^AdmzfdCWhgbW5=R`G!o;)({ zxJ@=pvw%&Ap-By4n^JN+oPzP$g6c7o-2LFHayZN2xS!lWvEWPQydHvlHCb~|d;M={ zkL_!**}X}0_qg8%sE$6w24QO|vTLzXqZShcg`we5IKU5?DsU>#Qid>oqOIU@jO=qh zzz@jaQyzNyE9rxlCTO;E&}T@W z=oZ~vznyNuZ6mWF`~d;=dd7!{o&fYlsN1Gt+VWr4jtw%ZJ}GyIIht5pnpXdMz7xVf z{Pkt52G z%`HS5Oa`Y5l>T%kcq>bSju$06K3f0@w_fdXG!myKAN@pr<9K> zUtww$wJtJJ&us7Ii5!|2tR)f0k7J7(f>EpqGwjhB39S%?AAJwwK7D7qIGruZG_p^S zC)c;%4C}4VxF9@BR23@l80zvbC`EU9X;VOItTz@v)k;fR>DMadqIbzEmm3NGrAOkI zO-71y4Ph!&)M<->_T*b3Dj((D26}%^cT4O$7h`nOZk6ti{g>0+h9cnNR$OJ4N6Imv zqeQENr;FApkB~g<%(6Rs%2u(RwcsPAIGTzqa93Rlc5n)pVm-%~ouVFu{yebNCz{Wd ze&~FOuIvA^Qa?7*GtAM_?Qfi3)7G3VBV)+MaHwz|S#!rK{t}4`J)!ABz8f7ytkO literal 0 HcmV?d00001 diff --git a/packages/app-mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/packages/app-mobile/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..bc11bfe4257e6244d0e58ff80d4719cde3bc6c3b GIT binary patch literal 2286 zcmcgtX;c#E8dd`(O$Bpd1O>Gjmt1ehG}lnlw5z$z)fThhHtt(ql|n@!6)prAuxkUX>IkaZ5sA=+3Wu?w@=A%y-Ur&iB0MeDCwV&-Xs(qXY%| zYN{KmD=8^y`kh3FC@CqUzig1IA`-RgJEWupYWG8}_5ze7bqh6tV-jpg0jnZ`!D-%;oYN@pe#ak#XA7 z%Q}tHoA-7K)&| zYFUVj`_3?@oHgUdi(GsM{0_!$4E0PD2~>y{DUwVCf$kvx4~V%`?au5=AmMxj z$qaM(t2(OiXX^|+R$jSq)Dt4P6Kw!JL_KKN`iv7M7-mRq3R2<|0tD*@%olav)}x(U zVl1hi#Wvg4O6?~^_=^MhsQ1+PH>hUI2jRF3bi{Pl0V6`|J&mBnO zcYD{bB4w=?!4){RGD;VH91Mhj(I@~Q82rCOFgiDb*vT=|0`b~T7^nU_2U|XE_n$&I zld}Iyk^_c!DV$4;CB`l6M@kc|iPBVD3v)e^5hn;>n5BhbHeI0XZX&45KF4?XB`w>d z!(^v|^V^w%r4O6|#yM>G&^!!ZhE!?ywePLMhYQ9Sz8JiZZncn6Mg&blS$Y8ggdJ|- z`nCe;^m}6)F_})>Q48TMBB;%XMOn`7QVU@MATf>w;#*vL`xf<4JZjdA{Q4DmS^HEo zP3XVP_W~QZT&s_A$nqBShape^YJSRvG}hKmn7QK2PRS8eEw4rUDO4L0OIff`X`D9i zF%dLJTlo8?-mixgL$C-R05YmWGeM^IrO;*Vpq|pFC%}0(0itpLzz%(M{S-7%GsVwV zp*=tHKnYpum>w!bW%+;`&V7XC98Rx5s(5SgV$0|_8}jj+(B(}{g#X+()+*gBfena}C1%yET!4F(^i*-=|A02jbn9k$5fXe2Q zNMp&#ghT-m{*)7rg-vXgOlp|gZz+lktxIqqife{lF^$+$S{p}K4zJh1nN|Vvb*W4X zm|B7K>PES>4?^b=c)Tp*Ih-qhPT1g%*NnFYg7Z+MjeLEt%BVNlmUNKEza*`09e-6s zO~3Db()BPO*<3x=$bz`*6G2#G_K%F(d@L^e$C7*`t5QvLkL56X?Gd78%b6@!v~ffQ zVGCz#hwVjxOmAETw^%_3vijcv70wEZ2l&fgZlsra{*gx$Nb2-gh#yDmYtc{@MWC`? zzO3T9*?t){d)`6?@3O8)hs%$6&KgB%psqV;^SXf~+--$dC*gUn z>Z&4L#T)!|OvS0JtDc1PScxKn(tX}f6H#4}e=y`L$jmaXf4N|o_mE|f+4*JCjCAY9p?jv5#G0wE&~oh|v{6fu6XF#L+#yn0Qy{81#h;WuRSDdBFg zW-57R{q6ETx=zQE_G5T@P%^mWSp`4NlIql!Z56mDr(5C(PRDrlG7H(E_Lb_y?2Q^Z zm-rF!os;Wyy$so7*S=QBsAx~=Jw+Imo$-ZDBG^ENXFGh*lO1S*qnF%pzp(33w-iH4 zLW@c#dk90ehT9VA3-hr|y`E$VX3Qw|burSo{5~P5M-_%W?E4ST3UD`BDc6ZmHg@BHbXM=d3^+;I;YNKElY+RpFIF9(OsQgJ8*rH^f19wqWML{ zh{Wj9>u!r4=6lL0DQjEU!5PLRj~UcTxwn|rjl0&g+RB!G&YmRtY|q^3;R~yLVv>*O z{-maOYLSaQSG8s%>$uvIE4-`z)M#)@PyS){>)ub&%lsVh z%3x1(blQ%I@4+oIs(6;ojh*f@rr2CLgd*I*WeF@3VI#lNko+j!(?!C!PtJ(*lkXoV z+}-WxT&Q)m5O)ph(G2;Sx}Njr@8$jw`5`7xrshD{*t2}F_?#c^aWYRt-zi%@* z>#|_SA^S2eHb_rA@fM#G#dEo`Zg zkePP_P?=jsTl80ziO`awx$#?R`kV9-I?ZVH2cT*(#v?jaVc)ix@ZNo5wov$=uu<`WWykDx$~hs*fIs;cSE{GW Y_Lb9mtIrfk^S*HVod`rXdtD^{4gq}9q5uE@ literal 0 HcmV?d00001 diff --git a/packages/app-mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/packages/app-mobile/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000000000000000000000000000000000000..9dce85cb96c0a47989b1d29c7d616649ac852e57 GIT binary patch literal 3251 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 O)zPoqovM!DzxxkvmoF#) literal 0 HcmV?d00001 diff --git a/packages/app-mobile/services/AlarmServiceDriver.android.ts b/packages/app-mobile/services/AlarmServiceDriver.android.ts index a5d6ada08a..a80a738f49 100644 --- a/packages/app-mobile/services/AlarmServiceDriver.android.ts +++ b/packages/app-mobile/services/AlarmServiceDriver.android.ts @@ -53,7 +53,8 @@ export default class AlarmServiceDriver { title: notification.title, message: notification.body ? notification.body : '-', // Required channel: 'net.cozic.joplin.notification', - small_icon: 'ic_notification', + small_icon: 'ic_launcher_foreground', // Android requires the icon to be transparent + color: 'blue', data: { joplinNotificationId: notification.id, noteId: notification.noteId, diff --git a/packages/react-native-alarm-notification/android/src/main/AndroidManifest.xml b/packages/react-native-alarm-notification/android/src/main/AndroidManifest.xml index a53e2073be..52c1187084 100644 --- a/packages/react-native-alarm-notification/android/src/main/AndroidManifest.xml +++ b/packages/react-native-alarm-notification/android/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ - diff --git a/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmModel.java b/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmModel.java index fd8c5ac8a3..1e8fdb6a38 100644 --- a/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmModel.java +++ b/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmModel.java @@ -369,7 +369,7 @@ public class AlarmModel implements Serializable { alarm.setActive(1); alarm.setAutoCancel(bundle.getBoolean("auto_cancel", true)); alarm.setChannel(bundle.getString("channel", "my_channel_id")); - alarm.setColor(bundle.getString("color", "")); + alarm.setColor(bundle.getString("color", "red")); Bundle data = bundle.getBundle("data"); alarm.setData(data); @@ -380,7 +380,7 @@ public class AlarmModel implements Serializable { alarm.setMessage(bundle.getString("message", "My Notification Message")); alarm.setPlaySound(bundle.getBoolean("play_sound", true)); alarm.setScheduleType(bundle.getString("schedule_type", "once")); - alarm.setSmallIcon(bundle.getString("small_icon", "ic_notification")); + alarm.setSmallIcon(bundle.getString("small_icon", "ic_launcher")); alarm.setSnoozeInterval((int) bundle.getDouble("snooze_interval", 1.0)); alarm.setSoundName(bundle.getString("sound_name", null)); alarm.setSoundNames(bundle.getString("sound_names", null)); diff --git a/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmReceiver.java b/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmReceiver.java index 448db6a028..ddd08ab3fa 100644 --- a/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmReceiver.java +++ b/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmReceiver.java @@ -9,7 +9,6 @@ import android.util.Log; import com.facebook.react.modules.core.DeviceEventManagerModule; import java.util.ArrayList; -import java.util.List; public class AlarmReceiver extends BroadcastReceiver { @@ -28,7 +27,7 @@ public class AlarmReceiver extends BroadcastReceiver { alarmUtil.sendNotification(alarm); alarmUtil.setBootReceiver(); - List alarms = alarmDB.getAlarmList(1); + ArrayList alarms = alarmDB.getAlarmList(1); Log.d(Constants.TAG, "alarm start: " + alarm.toString() + ", alarms left: " + alarms.size()); } catch (Exception e) { Log.e(Constants.TAG, "Failed to add alarm", e); diff --git a/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmUtil.java b/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmUtil.java index 5a1d4d9fee..8dc7823476 100644 --- a/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmUtil.java +++ b/packages/react-native-alarm-notification/android/src/main/java/com/emekalites/react/alarm/notification/AlarmUtil.java @@ -1,9 +1,5 @@ package com.emekalites.react.alarm.notification; -import static com.emekalites.react.alarm.notification.Constants.ADD_INTENT; -import static com.emekalites.react.alarm.notification.Constants.NOTIFICATION_ACTION_DISMISS; -import static com.emekalites.react.alarm.notification.Constants.NOTIFICATION_ACTION_SNOOZE; - import android.app.AlarmManager; import android.app.Application; import android.app.Notification; @@ -25,7 +21,6 @@ import android.os.Build; import android.util.Log; import android.widget.Toast; -import androidx.core.app.AlarmManagerCompat; import androidx.core.app.NotificationCompat; import com.facebook.react.bridge.WritableMap; @@ -38,6 +33,10 @@ import java.util.ArrayList; import java.util.Calendar; import java.util.Iterator; +import static com.emekalites.react.alarm.notification.Constants.ADD_INTENT; +import static com.emekalites.react.alarm.notification.Constants.NOTIFICATION_ACTION_DISMISS; +import static com.emekalites.react.alarm.notification.Constants.NOTIFICATION_ACTION_SNOOZE; + class AlarmUtil { private static final long[] DEFAULT_VIBRATE_PATTERN = {0, 250, 250, 250}; @@ -48,7 +47,7 @@ class AlarmUtil { AlarmUtil(Application context) { this.context = context; - this.alarmDB = new AlarmDatabase(context); + this.alarmDB = new AlarmDatabase(context); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { defaultFlags = PendingIntent.FLAG_IMMUTABLE; @@ -111,12 +110,12 @@ class AlarmUtil { String scheduleType = alarm.getScheduleType(); if (scheduleType.equals("once")) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - if (alarmManager.canScheduleExactAlarms()) { - AlarmManagerCompat.setAndAllowWhileIdle(alarmManager, AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); - } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + alarmManager.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + alarmManager.setExact(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); } else { - AlarmManagerCompat.setExact(alarmManager, AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); + alarmManager.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); } } else if (scheduleType.equals("repeat")) { long interval = this.getInterval(alarm.getInterval(), alarm.getIntervalValue()); @@ -153,12 +152,12 @@ class AlarmUtil { String scheduleType = alarm.getScheduleType(); if (scheduleType.equals("once")) { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - if (alarmManager.canScheduleExactAlarms()) { - AlarmManagerCompat.setAndAllowWhileIdle(alarmManager, AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); - } + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { + alarmManager.setAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); + } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + alarmManager.setExact(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); } else { - AlarmManagerCompat.setExact(alarmManager, AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); + alarmManager.set(AlarmManager.RTC_WAKEUP, calendar.getTimeInMillis(), alarmIntent); } } else if (scheduleType.equals("repeat")) { long interval = this.getInterval(alarm.getInterval(), alarm.getIntervalValue()); @@ -177,7 +176,7 @@ class AlarmUtil { duration = value; break; case "hourly": - duration = 60L * value; + duration = 60 * value; break; case "daily": duration = 60 * 24; @@ -318,9 +317,9 @@ class AlarmUtil { int smallIconResId; String smallIcon = alarm.getSmallIcon(); if (smallIcon != null && !smallIcon.equals("")) { - smallIconResId = res.getIdentifier(smallIcon, "drawable", packageName); + smallIconResId = res.getIdentifier(smallIcon, "mipmap", packageName); } else { - smallIconResId = res.getIdentifier("ic_notification", "drawable", packageName); + smallIconResId = res.getIdentifier("ic_launcher", "mipmap", packageName); } Intent intent = new Intent(context, intentClass); @@ -330,7 +329,7 @@ class AlarmUtil { intent.putExtra(Constants.NOTIFICATION_ID, alarm.getId()); intent.putExtra("data", alarm.getData()); - PendingIntent pendingIntent = PendingIntent.getActivity(context, notificationID, intent, PendingIntent.FLAG_MUTABLE | PendingIntent.FLAG_UPDATE_CURRENT); + PendingIntent pendingIntent = PendingIntent.getActivity(context, notificationID, intent, PendingIntent.FLAG_UPDATE_CURRENT); NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(context, channelID) .setSmallIcon(smallIconResId) @@ -379,9 +378,11 @@ class AlarmUtil { } //color - String color = alarm.getColor(); - if (color != null && !color.equals("")) { - mBuilder.setColor(Color.parseColor(color)); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + String color = alarm.getColor(); + if (color != null && !color.equals("")) { + mBuilder.setColor(Color.parseColor(color)); + } } mBuilder.setContentIntent(pendingIntent); @@ -409,8 +410,8 @@ class AlarmUtil { //large icon String largeIcon = alarm.getLargeIcon(); - if (largeIcon != null && !largeIcon.equals("")) { - int largeIconResId = res.getIdentifier(largeIcon, "drawable", packageName); + if (largeIcon != null && !largeIcon.equals("") && Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + int largeIconResId = res.getIdentifier(largeIcon, "mipmap", packageName); Bitmap largeIconBitmap = BitmapFactory.decodeResource(res, largeIconResId); if (largeIconResId != 0) { mBuilder.setLargeIcon(largeIconBitmap); diff --git a/packages/tools/generate-images.json b/packages/tools/generate-images.json index c835b7c5e2..49f0591073 100644 --- a/packages/tools/generate-images.json +++ b/packages/tools/generate-images.json @@ -58,10 +58,6 @@ "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/256x256.png_256_256__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/512x512.png_512_512__": true, "7_a088bffc3266cee9cf14dcb575533df2_Assets/LinuxIcons/1024x1024.png_1024_1024__": true, - "icns_to_icon_set_89ddfe84307b49fa96580655b5d7c045_216bb492f34224f24aabacb5f98c3620_fe652082bfb7427cd5c74566ecc24322_ebf1ccaf3f5b77b01ff690b763a411f9_216bb492f34224f24aabacb5f98c3620_950b970a784b14c329e09e78af827a77_ebf1ccaf3f5b77b01ff690b763a411f9_d33dafc8081155149dd1d8c1713bf03f_950b970a784b14c329e09e78af827a77_94949c497e46ed0c67082175f5bb22f8": true, - "11_5f89ab52500090249bf3464c17dae433_packages/app-mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png_24_24__": true, - "11_5f89ab52500090249bf3464c17dae433_packages/app-mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png_36_36__": true, - "11_5f89ab52500090249bf3464c17dae433_packages/app-mobile/android/app/src/main/res/drawable-xhdpi/ic_notification.png_48_48__": true, - "11_5f89ab52500090249bf3464c17dae433_packages/app-mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png_72_72__": true + "icns_to_icon_set_89ddfe84307b49fa96580655b5d7c045_216bb492f34224f24aabacb5f98c3620_fe652082bfb7427cd5c74566ecc24322_ebf1ccaf3f5b77b01ff690b763a411f9_216bb492f34224f24aabacb5f98c3620_950b970a784b14c329e09e78af827a77_ebf1ccaf3f5b77b01ff690b763a411f9_d33dafc8081155149dd1d8c1713bf03f_950b970a784b14c329e09e78af827a77_94949c497e46ed0c67082175f5bb22f8": true } } \ No newline at end of file diff --git a/packages/tools/generate-images.ts b/packages/tools/generate-images.ts index f58a348e7d..daf9b49b75 100644 --- a/packages/tools/generate-images.ts +++ b/packages/tools/generate-images.ts @@ -4,7 +4,6 @@ import { execCommand } from './tool-utils'; import { fileExtension } from '@joplin/lib/path-utils'; const md5File = require('md5-file'); const sharp = require('sharp'); -const svg2vectordrawable = require('svg2vectordrawable/src/svg-file-to-vectordrawable-file'); interface Source { id: number; @@ -61,14 +60,6 @@ const sources: Source[] = [ id: 9, name: 'WebsiteTopImageCn.png', }, - { - id: 10, - name: 'JoplinIconForeground.svg', - }, - { - id: 11, - name: 'JoplinNotificationIcon.svg', - }, ]; function sourceById(id: number) { @@ -80,47 +71,6 @@ function sourceById(id: number) { const operations: Operation[] = [ - // ============================================================================ - // Android icons - // ============================================================================ - - { - source: 10, - dest: 'packages/app-mobile/android/app/src/main/res/drawable/ic_launcher_foreground.xml', - width: 108, - height: 108, - }, - { - source: 11, - dest: 'packages/app-mobile/android/app/src/main/res/drawable-anydpi-v24/ic_notification.xml', - width: 24, - height: 24, - }, - { - source: 11, - dest: 'packages/app-mobile/android/app/src/main/res/drawable-mdpi/ic_notification.png', - width: 24, - height: 24, - }, - { - source: 11, - dest: 'packages/app-mobile/android/app/src/main/res/drawable-hdpi/ic_notification.png', - width: 36, - height: 36, - }, - { - source: 11, - dest: 'packages/app-mobile/android/app/src/main/res/drawable-xhdpi/ic_notification.png', - width: 48, - height: 48, - }, - { - source: 11, - dest: 'packages/app-mobile/android/app/src/main/res/drawable-xxhdpi/ic_notification.png', - width: 72, - height: 72, - }, - // ============================================================================ // iOS icons // ============================================================================ @@ -584,15 +534,6 @@ async function main() { s.webp({ // quality: 90, }); - } else if (destExt === 'xml') { - const options = { - floatPrecision: 2, - fillBlack: false, - xmlTag: false, - tint: '#FFFFFFFF', - }; - svg2vectordrawable.convertFile(sourcePath, destPath, options); - continue; } else { throw new Error(`Unsupported extension: ${destExt}`); } diff --git a/packages/tools/package.json b/packages/tools/package.json index 3f836830eb..eadf3b1388 100644 --- a/packages/tools/package.json +++ b/packages/tools/package.json @@ -37,7 +37,6 @@ "request": "2.88.2", "sharp": "0.32.1", "source-map-support": "0.5.21", - "svg2vectordrawable": "2.9.1", "uri-template": "2.0.0", "yargs": "17.7.2" }, diff --git a/yarn.lock b/yarn.lock index 8d5434c795..22bba498a5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5172,7 +5172,6 @@ __metadata: sharp: 0.32.1 source-map-support: 0.5.21 sqlite3: 5.1.6 - svg2vectordrawable: 2.9.1 typescript: 4.9.5 uri-template: 2.0.0 yargs: 17.7.2 @@ -7137,13 +7136,6 @@ __metadata: languageName: node linkType: hard -"@trysound/sax@npm:0.2.0": - version: 0.2.0 - resolution: "@trysound/sax@npm:0.2.0" - checksum: 11226c39b52b391719a2a92e10183e4260d9651f86edced166da1d95f39a0a1eaa470e44d14ac685ccd6d3df7e2002433782872c0feeb260d61e80f21250e65c - languageName: node - linkType: hard - "@tsconfig/node10@npm:^1.0.7": version: 1.0.9 resolution: "@tsconfig/node10@npm:1.0.9" @@ -7764,13 +7756,6 @@ __metadata: languageName: node linkType: hard -"@types/q@npm:^1.5.1": - version: 1.5.5 - resolution: "@types/q@npm:1.5.5" - checksum: 3bd386fb97a0e5f1ce1ed7a14e39b60e469b5ca9d920a7f69e0cdb58d22c0f5bdd16637d8c3a5bfeda76663c023564dd47a65389ee9aaabd65aee54803d5ba45 - languageName: node - linkType: hard - "@types/qs@npm:*": version: 6.9.7 resolution: "@types/qs@npm:6.9.7" @@ -8553,13 +8538,6 @@ __metadata: languageName: node linkType: hard -"abs-svg-path@npm:^0.1.1": - version: 0.1.1 - resolution: "abs-svg-path@npm:0.1.1" - checksum: af1a167c09e8bdb76c80adca7333f3d828e5b50e37b9702aa03675e271919e7b1eeaa35cce939970ecba14769953b7465ea34c2129ab683ddff9d973a07f164f - languageName: node - linkType: hard - "absolute-path@npm:^0.0.0": version: 0.0.0 resolution: "absolute-path@npm:0.0.0" @@ -10121,13 +10099,6 @@ __metadata: languageName: node linkType: hard -"boolbase@npm:^1.0.0": - version: 1.0.0 - resolution: "boolbase@npm:1.0.0" - checksum: 3e25c80ef626c3a3487c73dbfc70ac322ec830666c9ad915d11b701142fab25ec1e63eff2c450c74347acfd2de854ccde865cd79ef4db1683f7c7b046ea43bb0 - languageName: node - linkType: hard - "boolean@npm:^3.0.1": version: 3.1.4 resolution: "boolean@npm:3.1.4" @@ -11036,7 +11007,7 @@ __metadata: languageName: node linkType: hard -"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.1.0, chalk@npm:^2.3.1, chalk@npm:^2.4.1, chalk@npm:^2.4.2": +"chalk@npm:2.4.2, chalk@npm:^2.0.0, chalk@npm:^2.1.0, chalk@npm:^2.3.1, chalk@npm:^2.4.2": version: 2.4.2 resolution: "chalk@npm:2.4.2" dependencies: @@ -11547,17 +11518,6 @@ __metadata: languageName: node linkType: hard -"coa@npm:^2.0.2": - version: 2.0.2 - resolution: "coa@npm:2.0.2" - dependencies: - "@types/q": ^1.5.1 - chalk: ^2.4.1 - q: ^1.1.2 - checksum: 44736914aac2160d3d840ed64432a90a3bb72285a0cd6a688eb5cabdf15d15a85eee0915b3f6f2a4659d5075817b1cb577340d3c9cbb47d636d59ab69f819552 - languageName: node - linkType: hard - "code-excerpt@npm:^3.0.0": version: 3.0.0 resolution: "code-excerpt@npm:3.0.0" @@ -12583,19 +12543,6 @@ __metadata: languageName: node linkType: hard -"css-select@npm:^4.1.3": - version: 4.3.0 - resolution: "css-select@npm:4.3.0" - dependencies: - boolbase: ^1.0.0 - css-what: ^6.0.1 - domhandler: ^4.3.1 - domutils: ^2.8.0 - nth-check: ^2.0.1 - checksum: d6202736839194dd7f910320032e7cfc40372f025e4bf21ca5bf6eb0a33264f322f50ba9c0adc35dadd342d3d6fae5ca244779a4873afbfa76561e343f2058e0 - languageName: node - linkType: hard - "css-selector-parser@npm:^1.3": version: 1.4.1 resolution: "css-selector-parser@npm:1.4.1" @@ -12614,23 +12561,6 @@ __metadata: languageName: node linkType: hard -"css-tree@npm:^1.1.2, css-tree@npm:^1.1.3": - version: 1.1.3 - resolution: "css-tree@npm:1.1.3" - dependencies: - mdn-data: 2.0.14 - source-map: ^0.6.1 - checksum: 79f9b81803991b6977b7fcb1588799270438274d89066ce08f117f5cdb5e20019b446d766c61506dd772c839df84caa16042d6076f20c97187f5abe3b50e7d1f - languageName: node - linkType: hard - -"css-what@npm:^6.0.1": - version: 6.1.0 - resolution: "css-what@npm:6.1.0" - checksum: b975e547e1e90b79625918f84e67db5d33d896e6de846c9b584094e529f0c63e2ab85ee33b9daffd05bff3a146a1916bec664e18bb76dd5f66cbff9fc13b2bbe - languageName: node - linkType: hard - "css@npm:3.0.0": version: 3.0.0 resolution: "css@npm:3.0.0" @@ -12651,15 +12581,6 @@ __metadata: languageName: node linkType: hard -"csso@npm:^4.2.0": - version: 4.2.0 - resolution: "csso@npm:4.2.0" - dependencies: - css-tree: ^1.1.2 - checksum: 380ba9663da3bcea58dee358a0d8c4468bb6539be3c439dc266ac41c047217f52fd698fb7e4b6b6ccdfb8cf53ef4ceed8cc8ceccb8dfca2aa628319826b5b998 - languageName: node - linkType: hard - "cssom@npm:^0.4.4": version: 0.4.4 resolution: "cssom@npm:0.4.4" @@ -14339,17 +14260,6 @@ __metadata: languageName: node linkType: hard -"dom-serializer@npm:^1.0.1": - version: 1.4.1 - resolution: "dom-serializer@npm:1.4.1" - dependencies: - domelementtype: ^2.0.1 - domhandler: ^4.2.0 - entities: ^2.0.0 - checksum: fbb0b01f87a8a2d18e6e5a388ad0f7ec4a5c05c06d219377da1abc7bb0f674d804f4a8a94e3f71ff15f6cb7dcfc75704a54b261db672b9b3ab03da6b758b0b22 - languageName: node - linkType: hard - "dom-serializer@npm:^2.0.0": version: 2.0.0 resolution: "dom-serializer@npm:2.0.0" @@ -14375,7 +14285,7 @@ __metadata: languageName: node linkType: hard -"domelementtype@npm:2.3.0, domelementtype@npm:^2.2.0, domelementtype@npm:^2.3.0": +"domelementtype@npm:2.3.0, domelementtype@npm:^2.3.0": version: 2.3.0 resolution: "domelementtype@npm:2.3.0" checksum: ee837a318ff702622f383409d1f5b25dd1024b692ef64d3096ff702e26339f8e345820f29a68bcdcea8cfee3531776b3382651232fbeae95612d6f0a75efb4f6 @@ -14425,15 +14335,6 @@ __metadata: languageName: node linkType: hard -"domhandler@npm:^4.2.0, domhandler@npm:^4.3.1": - version: 4.3.1 - resolution: "domhandler@npm:4.3.1" - dependencies: - domelementtype: ^2.2.0 - checksum: 4c665ceed016e1911bf7d1dadc09dc888090b64dee7851cccd2fcf5442747ec39c647bb1cb8c8919f8bbdd0f0c625a6bafeeed4b2d656bbecdbae893f43ffaaa - languageName: node - linkType: hard - "domhandler@npm:^5.0.1, domhandler@npm:^5.0.2": version: 5.0.3 resolution: "domhandler@npm:5.0.3" @@ -14485,17 +14386,6 @@ __metadata: languageName: node linkType: hard -"domutils@npm:^2.8.0": - version: 2.8.0 - resolution: "domutils@npm:2.8.0" - dependencies: - dom-serializer: ^1.0.1 - domelementtype: ^2.2.0 - domhandler: ^4.2.0 - checksum: abf7434315283e9aadc2a24bac0e00eab07ae4313b40cc239f89d84d7315ebdfd2fb1b5bf750a96bc1b4403d7237c7b2ebf60459be394d625ead4ca89b934391 - languageName: node - linkType: hard - "dot-case@npm:^3.0.4": version: 3.0.4 resolution: "dot-case@npm:3.0.4" @@ -19649,13 +19539,6 @@ __metadata: languageName: node linkType: hard -"is-svg-path@npm:^1.0.1": - version: 1.0.2 - resolution: "is-svg-path@npm:1.0.2" - checksum: ed35f610d117f3bd2b6a1a637e9c03136f408976221c2396acfa811636ac71853b7509338245853154e2da69f9b5223a65ecf8d1d6192bd8b337a32b46b589e3 - languageName: node - linkType: hard - "is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3": version: 1.0.4 resolution: "is-symbol@npm:1.0.4" @@ -22418,13 +22301,6 @@ __metadata: languageName: node linkType: hard -"mdn-data@npm:2.0.14": - version: 2.0.14 - resolution: "mdn-data@npm:2.0.14" - checksum: 9d0128ed425a89f4cba8f787dca27ad9408b5cb1b220af2d938e2a0629d17d879a34d2cb19318bdb26c3f14c77dd5dfbae67211f5caaf07b61b1f2c5c8c7dc16 - languageName: node - linkType: hard - "mdurl@npm:^1.0.1": version: 1.0.1 resolution: "mdurl@npm:1.0.1" @@ -24229,15 +24105,6 @@ __metadata: languageName: node linkType: hard -"normalize-svg-path@npm:^1.0.0": - version: 1.1.0 - resolution: "normalize-svg-path@npm:1.1.0" - dependencies: - svg-arc-to-cubic-bezier: ^3.0.0 - checksum: 106e108b2f99e9e222a1c6edfc859523c6c3c2b0a6ba64743ed08af120b23b9bc2c16682bc2ae043a24c011c34c8252376c68525cf11735c6f110b571740eb2e - languageName: node - linkType: hard - "normalize-url@npm:^4.1.0": version: 4.5.1 resolution: "normalize-url@npm:4.5.1" @@ -24427,15 +24294,6 @@ __metadata: languageName: node linkType: hard -"nth-check@npm:^2.0.1": - version: 2.1.1 - resolution: "nth-check@npm:2.1.1" - dependencies: - boolbase: ^1.0.0 - checksum: 5afc3dafcd1573b08877ca8e6148c52abd565f1d06b1eb08caf982e3fa289a82f2cae697ffb55b5021e146d60443f1590a5d6b944844e944714a5b549675bcd3 - languageName: node - linkType: hard - "nullthrows@npm:^1.1.1": version: 1.1.1 resolution: "nullthrows@npm:1.1.1" @@ -25391,13 +25249,6 @@ __metadata: languageName: node linkType: hard -"parse-svg-path@npm:^0.1.2": - version: 0.1.2 - resolution: "parse-svg-path@npm:0.1.2" - checksum: bba7d4b4207fcc9eaf553b0d34db96ea8a1173635bc94528b5b66e1581902d4792d8d6229103764f01af4d839274234e97a4fa1c6f0fe7dcce195383848cec56 - languageName: node - linkType: hard - "parse-url@npm:^6.0.0": version: 6.0.0 resolution: "parse-url@npm:6.0.0" @@ -26573,7 +26424,7 @@ __metadata: languageName: node linkType: hard -"q@npm:^1.1.2, q@npm:^1.5.1": +"q@npm:^1.5.1": version: 1.5.1 resolution: "q@npm:1.5.1" checksum: 147baa93c805bc1200ed698bdf9c72e9e42c05f96d007e33a558b5fdfd63e5ea130e99313f28efc1783e90e6bdb4e48b67a36fcc026b7b09202437ae88a1fb12 @@ -28554,7 +28405,6 @@ __metadata: node-gyp: 9.3.1 nodemon: 2.0.22 npm-package-json-lint: 6.4.0 - svg2vectordrawable: ^2.9.1 typedoc: 0.17.8 typescript: 4.9.5 languageName: unknown @@ -29826,13 +29676,6 @@ __metadata: languageName: node linkType: hard -"stable@npm:^0.1.8": - version: 0.1.8 - resolution: "stable@npm:0.1.8" - checksum: 2ff482bb100285d16dd75cd8f7c60ab652570e8952c0bfa91828a2b5f646a0ff533f14596ea4eabd48bb7f4aeea408dce8f8515812b975d958a4cc4fa6b9dfeb - languageName: node - linkType: hard - "stack-trace@npm:0.0.10": version: 0.0.10 resolution: "stack-trace@npm:0.0.10" @@ -30611,69 +30454,6 @@ __metadata: languageName: node linkType: hard -"svg-arc-to-cubic-bezier@npm:^3.0.0": - version: 3.2.0 - resolution: "svg-arc-to-cubic-bezier@npm:3.2.0" - checksum: 55bf17756d558b9c0daddf636a6c9f2fe01fd5ac412229dfa2d4b29740226a82c980bcd3b5eb09ce311cbea282106c7549d97f8c8dba3a5a7b75f786bcb5e155 - languageName: node - linkType: hard - -"svg-path-bounds@npm:^1.0.1": - version: 1.0.2 - resolution: "svg-path-bounds@npm:1.0.2" - dependencies: - abs-svg-path: ^0.1.1 - is-svg-path: ^1.0.1 - normalize-svg-path: ^1.0.0 - parse-svg-path: ^0.1.2 - checksum: 8590a4e14942a34f595df64d804a3533cb83a29498b34f61723cf3172958a5a3c3b211805c6c4b2f93fb90ff4eab74b08a2dc1daa489d6ba429534aca5f5184d - languageName: node - linkType: hard - -"svg2vectordrawable@npm:2.9.1, svg2vectordrawable@npm:^2.9.1": - version: 2.9.1 - resolution: "svg2vectordrawable@npm:2.9.1" - dependencies: - coa: ^2.0.2 - mkdirp: ^1.0.4 - svg-path-bounds: ^1.0.1 - svgo: ^2.8.0 - svgpath: ^2.5.0 - bin: - s2v: bin/svg2vectordrawable - svg2android: bin/svg2vectordrawable - svg2avd: bin/svg2vectordrawable - svg2drawable: bin/svg2vectordrawable - svg2vector: bin/svg2vectordrawable - svg2vectordrawable: bin/svg2vectordrawable - checksum: 37f83e21f6dd81a09afcbe2b01f09c9cde3f9c1614045a66e5ae82d550f2629b0bad6335913fd13e8dc1d885bcfcb184f410100419ec3ba53380ae0a2034c939 - languageName: node - linkType: hard - -"svgo@npm:^2.8.0": - version: 2.8.0 - resolution: "svgo@npm:2.8.0" - dependencies: - "@trysound/sax": 0.2.0 - commander: ^7.2.0 - css-select: ^4.1.3 - css-tree: ^1.1.3 - csso: ^4.2.0 - picocolors: ^1.0.0 - stable: ^0.1.8 - bin: - svgo: bin/svgo - checksum: b92f71a8541468ffd0b81b8cdb36b1e242eea320bf3c1a9b2c8809945853e9d8c80c19744267eb91cabf06ae9d5fff3592d677df85a31be4ed59ff78534fa420 - languageName: node - linkType: hard - -"svgpath@npm:^2.5.0": - version: 2.6.0 - resolution: "svgpath@npm:2.6.0" - checksum: 57bd2512b41a03a729c2880a6c771bb8ad449a9cea47c1fc43ac5cec70bf81a607591bb916ba16c21c9d87122537bcdf2ac4082dae13559c84c964b8fe868204 - languageName: node - linkType: hard - "symbol-tree@npm:^3.2.4": version: 3.2.4 resolution: "symbol-tree@npm:3.2.4"