From 0ed8d5e62e15417087e62480642a2ada421e2aaa Mon Sep 17 00:00:00 2001 From: Isira Seneviratne Date: Wed, 8 Jul 2020 15:43:33 +0530 Subject: [PATCH] Replace accept and reject PNGs with vector drawables. --- res/drawable-hdpi/ic_accept_pairing.png | Bin 418 -> 0 bytes res/drawable-hdpi/ic_reject_pairing.png | Bin 474 -> 0 bytes res/drawable-mdpi/ic_accept_pairing.png | Bin 287 -> 0 bytes res/drawable-mdpi/ic_reject_pairing.png | Bin 337 -> 0 bytes res/drawable-xhdpi/ic_accept_pairing.png | Bin 520 -> 0 bytes res/drawable-xhdpi/ic_reject_pairing.png | Bin 624 -> 0 bytes res/drawable-xxhdpi/ic_accept_pairing.png | Bin 786 -> 0 bytes res/drawable-xxhdpi/ic_reject_pairing.png | Bin 894 -> 0 bytes res/drawable-xxxhdpi/ic_accept_pairing.png | Bin 1092 -> 0 bytes res/drawable-xxxhdpi/ic_reject_pairing.png | Bin 1230 -> 0 bytes res/drawable/ic_accept_pairing_24dp.xml | 10 ++++++++++ res/drawable/ic_reject_pairing_24dp.xml | 10 ++++++++++ src/org/kde/kdeconnect/Device.java | 4 ++-- .../Plugins/SharePlugin/ReceiveNotification.java | 2 +- .../Plugins/SharePlugin/UploadNotification.java | 2 +- 15 files changed, 24 insertions(+), 4 deletions(-) delete mode 100644 res/drawable-hdpi/ic_accept_pairing.png delete mode 100644 res/drawable-hdpi/ic_reject_pairing.png delete mode 100644 res/drawable-mdpi/ic_accept_pairing.png delete mode 100644 res/drawable-mdpi/ic_reject_pairing.png delete mode 100644 res/drawable-xhdpi/ic_accept_pairing.png delete mode 100644 res/drawable-xhdpi/ic_reject_pairing.png delete mode 100644 res/drawable-xxhdpi/ic_accept_pairing.png delete mode 100644 res/drawable-xxhdpi/ic_reject_pairing.png delete mode 100644 res/drawable-xxxhdpi/ic_accept_pairing.png delete mode 100644 res/drawable-xxxhdpi/ic_reject_pairing.png create mode 100644 res/drawable/ic_accept_pairing_24dp.xml create mode 100644 res/drawable/ic_reject_pairing_24dp.xml diff --git a/res/drawable-hdpi/ic_accept_pairing.png b/res/drawable-hdpi/ic_accept_pairing.png deleted file mode 100644 index b95ffdb38642eedf3d263632ebc2b4952bcc8c65..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 418 zcmV;T0bTxyP)r1y(=-JT)n>jY};P0J(vPNREA2#{k$^h=_#P zXR8Cyv<|C(R6zu``gVILd_5ng&&8b8JX0Q<2Do z?lm$~t{fbQWh%i_@% M07*qoM6N<$f;_ga7ytkO diff --git a/res/drawable-hdpi/ic_reject_pairing.png b/res/drawable-hdpi/ic_reject_pairing.png deleted file mode 100644 index 1669ea3d25fc1a03c7b6c34383cee8aa79618d69..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmV<00VV#4P)Bp330Rua3lybSXhHNQlC&N`KWt}V7Rq8av$NS! zsS6K+*~FL4?94=n^Y{lN1R@{@)<6a95qZ1z!vx-@(J7n{kCOpfDa21 zof3%K5V-^j2N9ha&~cG@ZBa%s=SmeGWE2m!GPfRO6tT^2G6nD(a3K7lob%og=%n2@ zG2G-42!OOfN}e0y+$Y1lF(v734J#A;m^-SGQZi};chf1v2J3L< zuE@cps}L_1xzwgA%2C7)lck4dS4^nl#fP?MR5;40_{*>h<61Mt+nT)~Di)65ZnYje lV!+-GD|5y(xmM6)#21+96U6!Didg^v002ovPDHLkV1kNbd1?Rv diff --git a/res/drawable-mdpi/ic_reject_pairing.png b/res/drawable-mdpi/ic_reject_pairing.png deleted file mode 100644 index cc28d1346761fc8ca85392422a70163c8d2fa1e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 337 zcmV-X0j~auP)|VUJL-R4SgS1)+DS=wbTUT87$%-at1t0}+NH^XRxU@PW+Z|1p`w z^OhcKAOk9Z0RzInOCZHFPH_ajz-XWW4*v+RfUAYDOpbSr;UX@Y7}GM&B-RyF&iNgP zfQ}GqaqlUue*m8{$Ow@L_qLJ=7Y}f6N8CG61{HCzLvbD(6c)up#orZ_0aN6(L-EPP zB+hwL27{(>tzcpj=kzWHfpB)~V!$lKL!l-*lbSLpEyO!T;pKZb${^J|Q#t2i;UnT+ zqH458I{3hMu4}ZHw9ZtG=HXPFJ1X|3d6dr(zu1mz7n8H?xSk@$!DSL=Hfd3XkAthg j_V1AzpJJjb=rZC5&ch5py#sTN00000NkvXXu0mjfsNIlr diff --git a/res/drawable-xhdpi/ic_accept_pairing.png b/res/drawable-xhdpi/ic_accept_pairing.png deleted file mode 100644 index 72fa0108ee457203186a9716e1cc63a2077972b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 520 zcmV+j0{8uiP)iJfeKKosRDl+xd0DA38*#zAFIZD zg|^`Lpc@1DSU;e5N$?Hm2x=)=fk)4cEY+@OHi{q*XpU1lJuS|=SE_^UyqSjrpPY&Uyo`TXb zP076&^bNijsfs;#3g05zVq~7ecS3W8!3j?`KzW5ICb;3ruh7yYrkId`Cr@HZ8l5vC1y4?+)P-!y zgcLk^A=4=(CZypUQ2yDW?f^AXOCY%nodpuZa>%n0000< KMNUMnLSTZ!SK%lC diff --git a/res/drawable-xhdpi/ic_reject_pairing.png b/res/drawable-xhdpi/ic_reject_pairing.png deleted file mode 100644 index e8589a727a533488a3d1bed3659da724945b6296..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 624 zcmV-$0+0QPP)HSJbKuybGn zB1xTd&LokNfp1~-#Q#suWo8T`h#-RCh!BtgDnK6?0Vc3QOuQz(D+6g9<9l2JRp1lY zNHPT;futY8&wvI#-Hj$opbo^n5?=tm8HDd5rdiHS;m5$63&M91ZzIAj{uKD|K)l5O z|C8;>dnta~1k0Ov^+Ejhbkbh18=tw+*(!eyz`z`csTgPwZoUTcKvzLn6W{Qf@Y@%a z6Lv)qe~rHn106~6VH}$ym=K5Exr~7-K}3FM4AsQ8cq?uR;~r!ZGfHmLu@NFZw`ZWp7tAOIbc>Xxg9%;n)_L&%4VW&7Hxy57r71LG6z{Z%J8mxGKBM@q z;)$)bjg}e3>!cla+))gqnZ?VT*!xIPlesCgcn%X|YBDF{iEzV$;x=h_*cA!m?q%wM zB(b2$Dem#xCh~-WW&tE*tFpQWC1sIVQa-EH#Bt3-jf*cJs@j>z9e{zXZf~gWqxc#} zXD)(mKCi{U@5!sAo4W&##h-9@s3RUtryA#zcUstUmv)=1;Zek}-M3^AzQBDxYWNTr z*fES>A0@LCU3;*?Bc7DNz1IL9wZ;xLK{J7SIi0000< KMNUMnLSTYYO%*5r diff --git a/res/drawable-xxhdpi/ic_accept_pairing.png b/res/drawable-xxhdpi/ic_accept_pairing.png deleted file mode 100644 index a49f451d6fcfc88e4d1dd58f00bca57c0cea08e2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 786 zcmV+t1MU2YP)%V2 ztW#{SXXkcjkNKs)vF?29Prkj`nb|W&rBbO>Dpj~Pz#VW8djjzOdjzz-SWc>e+KO9Jx>{8a#$s!wrjS+xZo3WVc5#4%>kYw(p|INnz{*5v=3 z65z~3+DbX+3=4uYf4e1_lTHhSGe2?Hs{MlDc-IyJv@phy4&Xi@PO2rC>=yv%7x*o% z{+Av1y^gh2DR8_#tvH@_?RHTZ9IulV3tYC8MTu~{J})`9%>igoFdQellph#V6ghG-6hrHB?S*(UYk^+akSdC40SVLDzIOKE(N5aeshZB`B<4U<& z!EmBeu3SlbD-=$2(w?*IV}-$CDf@624y_5<9jY1vNQjf%7(N=IYGIU`GeQ=-C9}GA(@nhrYMc7Eg||%uw2i4v zt``d&nufes;D7S3rs!h9&Q&#C>33}Yy_#Z-pIzcHUDNPaQ>aubl}g30XXnfW#EY*y~D7bU?^AaatD25rtcm4M`EPHfFdI|0f`PTcHEc`I<(N`O&M>Kqew5=$|8m;pJO zuN-?T?8W>5=7GAwHz>!N1AY?5_-Inl1woEpIc5w=s;hpIP-7n<$EliZSy1KZ6p50O zazsK>89Cm#2|;B;a;TEp$w^8oA+M9%3B)wJKEE(-w~{)^(V0hFXOp@OStHyE#TUjd zq?D9K4rP8@p$MuH=ZgYS61SX|+BTu`hS*@IO0pqG(g6A}g7OAymTo24lB1cz2--AU z*cDQIAaw_FBg16<6RuZ=yz0^lRrUk`YEU-zs=-VXi<1%0LX_?=1AZI2;7l1<&s!-f; zAg6A)Rl>T}n06q?WUGXIv)XT{-GSX(*^(re_}AD;@ywANo03i`9mQ3LaxkqD%(X64 z1m%!T`&q+hjx2h1%8n|u)rkv}@R&w!jewK}t8F$01Y z1ar0nma`=+M6OE50m}IWyb_l37Wf^IoJ(LpSk6cwk}gebCn(>f6VGp}0pU13o=)6b zHs_qQC4dig(w&W^oKj4Fb6g?kL;#UL(ym$*Q{mWK*~kaAS#2^%X{vtCn8-k6NwA_m z=?1aEeyZA}!y=>UQ^zdp>cCF+n&i>%trE~se_yNTcGdq*QBEIXVq#)qV*bDU1rQi+ UzTd`HR{#J207*qoM6N<$g5nsPTL1t6 diff --git a/res/drawable-xxxhdpi/ic_accept_pairing.png b/res/drawable-xxxhdpi/ic_accept_pairing.png deleted file mode 100644 index c4596d1156d2d615590e10c77f8d856fc047cea9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1092 zcmV-K1iSl*P)Hyl zP;gQ~fin~KBsht1XV31DwRr>9-}AG^XNKy z6TOc*pz=5I%PN0_!KW_jHuvBd^uJCgo zyJ91NRfV71D>k~GzZHI=;xE=NX;tADHtUU9P2m^z2hIR?6@FpwaKWeY?rVkLQB^ie zY5b(Z@7NO@0n97>j{Tk^fI7p8tQsIO!6z?s1hCoVNhIbtV~#?Q0-wCW5x_nJd~g(k zB>3b#jsT9C;M)#C8vJyUrfZ!u!nYNIMEK-0jsUKh;d6%|6+Zb=asV75NQTcAfQ=@I zBLwO2*_t5ki!etBKEP+Y2y=ErIYRISK3g}G>qd+t1fSru-H34vMR0`R8+^8*2(H1n zZbI-8KHFd%=WuiQkqDrSU%|_5cuR5HUglM>q7w{NQZw2 z78e7YaqtBakKwlsBWt3^Z<-~A-~)W?k0_B`J*1a-2H(j;dTE!m;V=YW;5WeGvX`Me zFTiQ%%U!N1^gGL3Iv1_0d7<$CEpJ)c8l%%108By2T8bEc4Frh#z1tDO-vS{^mXT-y zyMu_}Q@P0_5GGp6F_vX3he4=D0}tT@1TWlr`a7g#Yo6#jL3Nc>+{(3?=Z-n1Zsu7~RNhTB_Vl0w zJ#DgK?nvoEPER0S8lRch_RM>h&1WV+x3g8LR4SE9rBbO>!t@u{_fnX!O%Ut=0000< KMNUMnLSTYp-Ts9D diff --git a/res/drawable-xxxhdpi/ic_reject_pairing.png b/res/drawable-xxxhdpi/ic_reject_pairing.png deleted file mode 100644 index 5ffd8d000d2c64c7d04f2283235a9936cd9d31bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1230 zcmV;<1Tp)GP)Yw3bv%r{s4nDV5Y%E?EflgoqSOyM=SOSKD4xn6YKCUwT zpE?QrAvFCYc7O?>MgQ&CsuD;8YZgpDiB+HvsECvCI0QTeemFEfpG{x@xDa*o?*pG1 z8K2KO&=p1FuL3iSjn8KqsE>;I4}dL?%n$gbKe65_0lf6k_V*at(k@c#k7=IjVRn&6glJZX=rEm9b znUw*W_3%Mi%C^!^ctULcZT)+zEQOFc(gADIRZptl{m4ce@w)-@m8B3e|7kxq5{B?i z9WE>|rnEuxkA|GJWWI?IdQF*smZ;oN$b3^F6f&PWgcW6IwM8qD8L1G%UDlHMfl@^8 zvDriblZ4HUN=qSxF`x4K^P1Xxys%I%nhG1jyhr9E+tgFiPD5=zQz5uCKcJm5fDwbe zR_YKqn2!un2C%Hm&CTaShLG{VeB=X_`E?fVPANj*WPU(3r|GB35ICBT+@%Ph-*S;G zYzSPh`iG#~j&5x}nFR^MquaBY6DAFX8VGw8R54S|FC$esicfdFI(ay$gdMcDC0*!O8@ zrSg0lI_t6du0wc3@#4oAn_p$Iy?Gjjd@RO=t?gtPhmiKE99>FP(?*Zk+3JW|=H_z_ zp_=LB$cjfb2r~akGT|{Q3lZAiTRvDXrm0ET;EpvU_OTsaO+k=5o^LD z^GoS5Q@qDl%79udPtB<6IAKC)CVG!469M3o>s5jmhfBa4Ef>*>2?2M@P;6PkMQmr3 zA@va%QYZvd70g0IAC>t?k1{BH1DggzaIr;+()^sVa4zWpp&=N8>rHx;J0;V~f^gmY zI^m0s$~M(C6I0KV)Wx9R%8h%LC+&{L*!<^; zf$-R_g&3NTGpTcmiE5PDePrCg2Gu3SOn8*zMhwiyqk58xsTv|4!YAOSVlMn7tVDF! zNh(iN8?g&>hU1uD%}l zYT6d|6CSI>1MavOpVQ5hgo=^y5U5_qQ&zlt?@=-Tdc!i^ox)?jwk?>Bi>7eh&K+fN z^@7jCQ@ft}eIzs;w^`v@&9=A=GZaNWJn{uk9l-^{c=iJByTZ+HxKwgav!j28kKwkU sAw8z!C#za)6p2J4kw_#GiA0?A7oWAsH0YS^m;e9(07*qoM6N<$f;d=5umAu6 diff --git a/res/drawable/ic_accept_pairing_24dp.xml b/res/drawable/ic_accept_pairing_24dp.xml new file mode 100644 index 00000000..0432fa69 --- /dev/null +++ b/res/drawable/ic_accept_pairing_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/res/drawable/ic_reject_pairing_24dp.xml b/res/drawable/ic_reject_pairing_24dp.xml new file mode 100644 index 00000000..16d6d37d --- /dev/null +++ b/res/drawable/ic_reject_pairing_24dp.xml @@ -0,0 +1,10 @@ + + + diff --git a/src/org/kde/kdeconnect/Device.java b/src/org/kde/kdeconnect/Device.java index 94597a5d..658da13e 100644 --- a/src/org/kde/kdeconnect/Device.java +++ b/src/org/kde/kdeconnect/Device.java @@ -404,8 +404,8 @@ public class Device implements BaseLink.PacketReceiver { .setContentIntent(pendingIntent) .setTicker(res.getString(R.string.pair_requested)) .setSmallIcon(R.drawable.ic_notification) - .addAction(R.drawable.ic_accept_pairing, res.getString(R.string.pairing_accept), acceptedPendingIntent) - .addAction(R.drawable.ic_reject_pairing, res.getString(R.string.pairing_reject), rejectedPendingIntent) + .addAction(R.drawable.ic_accept_pairing_24dp, res.getString(R.string.pairing_accept), acceptedPendingIntent) + .addAction(R.drawable.ic_reject_pairing_24dp, res.getString(R.string.pairing_reject), rejectedPendingIntent) .setAutoCancel(true) .setDefaults(Notification.DEFAULT_ALL) .build(); diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/ReceiveNotification.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/ReceiveNotification.java index 3358685b..a9d2df1d 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/ReceiveNotification.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/ReceiveNotification.java @@ -85,7 +85,7 @@ class ReceiveNotification { cancelIntent.putExtra(SharePlugin.CANCEL_SHARE_DEVICE_ID_EXTRA, device.getDeviceId()); PendingIntent cancelPendingIntent = PendingIntent.getBroadcast(device.getContext(), 0, cancelIntent, PendingIntent.FLAG_UPDATE_CURRENT); - builder.addAction(R.drawable.ic_reject_pairing, device.getContext().getString(R.string.cancel), cancelPendingIntent); + builder.addAction(R.drawable.ic_reject_pairing_24dp, device.getContext().getString(R.string.cancel), cancelPendingIntent); } public void setTitle(String title) { diff --git a/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java b/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java index 886c8143..4ec79bc1 100644 --- a/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java +++ b/src/org/kde/kdeconnect/Plugins/SharePlugin/UploadNotification.java @@ -63,7 +63,7 @@ class UploadNotification { cancelIntent.putExtra(SharePlugin.CANCEL_SHARE_DEVICE_ID_EXTRA, device.getDeviceId()); PendingIntent cancelPendingIntent = PendingIntent.getBroadcast(device.getContext(), 0, cancelIntent, PendingIntent.FLAG_UPDATE_CURRENT); - builder.addAction(R.drawable.ic_reject_pairing, device.getContext().getString(R.string.cancel), cancelPendingIntent); + builder.addAction(R.drawable.ic_reject_pairing_24dp, device.getContext().getString(R.string.cancel), cancelPendingIntent); } public void setTitle(String title) {