From 8622c6c5f959fd8b7b5ba8b3ea5bd1d4084a8446 Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Wed, 8 Jul 2020 11:23:43 +0530
Subject: [PATCH] Replace keyboard PNGs with a vector drawable.

---
 res/drawable-hdpi/ic_action_keyboard.png          | Bin 351 -> 0 bytes
 res/drawable-mdpi/ic_action_keyboard.png          | Bin 431 -> 0 bytes
 res/drawable-xhdpi/ic_action_keyboard.png         | Bin 451 -> 0 bytes
 res/drawable-xxhdpi/ic_action_keyboard.png        | Bin 468 -> 0 bytes
 res/drawable/ic_action_keyboard_24dp.xml          |  10 ++++++++++
 res/menu/menu_mousepad.xml                        |   2 +-
 res/xml/remotekeyboardplugin_keyboard.xml         |   2 +-
 .../RemoteKeyboardPlugin.java                     |   2 +-
 8 files changed, 13 insertions(+), 3 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_action_keyboard.png
 delete mode 100644 res/drawable-mdpi/ic_action_keyboard.png
 delete mode 100644 res/drawable-xhdpi/ic_action_keyboard.png
 delete mode 100644 res/drawable-xxhdpi/ic_action_keyboard.png
 create mode 100644 res/drawable/ic_action_keyboard_24dp.xml

diff --git a/res/drawable-hdpi/ic_action_keyboard.png b/res/drawable-hdpi/ic_action_keyboard.png
deleted file mode 100644
index b3a72f616aae641de3bbc8305dcd29aee562b7cc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 351
zcmV-l0igbgP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz0ZBwbRCwC#m(dM_AQVNl@z(+D09`=G
za1I=x)08<nMqR)GWB>-BkCdiJ!4gujP3}nyiAN$YK5w8X000000Fo({QZ<dI#m%xD
z^+@hWL-RK2<@LPU(USbMp|_bTv-pc6Iy3fkG0()OKhxDZP8T<9=xv6>zqb$y0Ep2?
zRQ3TsT9L_8{mMH&`78N(%~vMpS)c%JVyy@~6YHBquid=nkwSZ;TS!`M;3AyQ?fb+r
zUL<-E>A|is+Ilu~-i?!qJmyOTa-9{YU-#I|p@5txve4;=`cxt|fYU;;4^pe$GOdYI
xt8%0e3i!c)pv|-<p-*9mCjbBd0A%1UzyR)Id}WrhysZEL002ovPDHLkV1oZ`lx6?`

diff --git a/res/drawable-mdpi/ic_action_keyboard.png b/res/drawable-mdpi/ic_action_keyboard.png
deleted file mode 100644
index 2f6bd0a53c0aa4f5467e0e01bc5ea5b01537f36d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 431
zcmV;g0Z{&lP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzQAtEWRCwC#R>6^jFbuQ_Ul))RKm(+V
zOB+rBsUro1HlU2S0SY(@NCBK6f>U;6W-gDw%vm3ql~%~ItntpQEW4CIO5oooVEev5
zklyomYps0{Rtld7VJ%?=t=&wtHUM|zvn~YIk?%Le{I!w6)50@w=D>I16bL&LcB6GE
z5;y{P<g>mBtRmkEV$QZ~?IXyCG7P(%%02B`DQl~h5PUU$r(kGXw+T<Azh1!SnGcP0
z5pY9z&Anhm(_RU?$i`zn#=WwBiJ5a3YaQwUpGv6t77C7Wox%^<*5<%`$3K}s87Zsb
z`+JfJGIoIT4Lm<Q44@kMAR*_U`-nruKPmy+1E=C1@z681!r$H?3cQ1uG|CX^fD=R|
zaL6=~A!HWt58i^9K^a8v$~eH5jvyv(p?Uryi)GHXd;|_27VpaVATe8&^e9aUqy&Bh
Z7yzl3i}ym=1#JKT002ovPDHLkV1iqhv%CNR

diff --git a/res/drawable-xhdpi/ic_action_keyboard.png b/res/drawable-xhdpi/ic_action_keyboard.png
deleted file mode 100644
index f8ed0aab93c2c8171c2b7a81ac9dce6eacfae416..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 451
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7*jo6978H@y_xYgx7k3Tt?=l5o(X&xSYJrIl`?R6euCkn
z)Jus(Mm7(&1cs_<1=TA*h<mN_vgv1G`}m7Teg6A`P)49lK#;@t*zdB5Dfjtx$7Xcz
z=ghEa&Nv?VUFWRb0%=!sn;Xx%O?I#8H(&Oh&qCj3yV8bJA1sqr7avQD)%KOX@O9B^
zxtz}$zLQ@zTwlJnoq_KFV@hLgIwKdO(*yPM%a(QjH7#|%e7*IYXJ+y?``Q_IFQ%=3
z#V&4@zcGK+^VepFBg10NHy(27o4l)k-x`_e*0;B8-Z$%d?}}+A9n1v`kqV&`0!$9D
zIX#HDasKK{_R#8j7bo}pus!Zvlk;awzAyRkwLa^QOGNorEvIXnv|sGkzhKsBc)iD8
z>;R+1gK1HJb3}BTs+<=s_;0#MR;;eUsYm-bdqb<!iYZ6bp2in%*4$MlsB<*5_^o|m
rLo|c+B?X}KEgEzn!NR~`S;J|-kYT)@Nt9P%Gf2?W)z4*}Q$iB}convG

diff --git a/res/drawable-xxhdpi/ic_action_keyboard.png b/res/drawable-xxhdpi/ic_action_keyboard.png
deleted file mode 100644
index 6838f97d5adfd0dc31df45bf7f39301bb95ba366..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 468
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGok|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+7|T3e978H@y}A9-_mG1Kd&0R7`phpFbQ+Q^+Ib$Bl&M8F
zFs3lD9S9GeylhLs(i5FO_bm~Us@t+R{lh!YbYq|`V6bCX$bSnNKL3v&Djt>oo^om1
zZsVfWXCBKuRo>mvo|;xC{`0)wzdM%ObCvh&&ye4<tn%{{)os^>_3s_o_U`8Yd6gUX
z{V8(Um$hwM@$);|^3E*`srxWXu7+dEQU<OC3>png0Visb>Ly$Fzl)acIq{zD+tX*?
zTR-o-&cbl#l)w3wJgwe5ouyOe?f(5}?<=<3t6cWIJeOw9p}c?Ig!M}CrJs_IeYDP(
zO;B70GHL+>m&3u*1Fruc_E)|+Cct!Hi~S*S)5mOIOjmZ9zL@pL{n<`=(-+6&>fcz*
zY>Q&ofVrSR*5GT|>}`v0cQP>id#3YZR+8ISv(x(-f7`LGT<%<@`#HYieAS2Wy6w70
zL>O2D7(^Txcf7S)Ft1JT-%YCn;RcMbpi+-#;$h(3Txsy&P4;?_pr@;!%Q~loCICx>
B%dG$a

diff --git a/res/drawable/ic_action_keyboard_24dp.xml b/res/drawable/ic_action_keyboard_24dp.xml
new file mode 100644
index 00000000..533fc156
--- /dev/null
+++ b/res/drawable/ic_action_keyboard_24dp.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
+</vector>
diff --git a/res/menu/menu_mousepad.xml b/res/menu/menu_mousepad.xml
index cccb334c..cd484135 100644
--- a/res/menu/menu_mousepad.xml
+++ b/res/menu/menu_mousepad.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_show_keyboard"
-        android:icon="@drawable/ic_action_keyboard"
+        android:icon="@drawable/ic_action_keyboard_24dp"
         android:title="@string/show_keyboard"
         kdeconnect:showAsAction="ifRoom" />
 
diff --git a/res/xml/remotekeyboardplugin_keyboard.xml b/res/xml/remotekeyboardplugin_keyboard.xml
index 3f0c5a72..62c40ebb 100644
--- a/res/xml/remotekeyboardplugin_keyboard.xml
+++ b/res/xml/remotekeyboardplugin_keyboard.xml
@@ -15,7 +15,7 @@
             android:keyWidth="40%" />
         <Key
             android:codes="2"
-            android:keyIcon="@drawable/ic_action_keyboard"
+            android:keyIcon="@drawable/ic_action_keyboard_24dp"
             android:keyWidth="40%" />
         <Key
             android:codes="3"
diff --git a/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java b/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java
index 69cb4368..66ac6127 100644
--- a/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java
+++ b/src/org/kde/kdeconnect/Plugins/RemoteKeyboardPlugin/RemoteKeyboardPlugin.java
@@ -157,7 +157,7 @@ public class RemoteKeyboardPlugin extends Plugin {
 
     @Override
     public Drawable getIcon() {
-        return ContextCompat.getDrawable(context, R.drawable.ic_action_keyboard);
+        return ContextCompat.getDrawable(context, R.drawable.ic_action_keyboard_24dp);
     }
 
     @Override