From 607d27a139797902be2859abc1d4aadf3dbe1b2e Mon Sep 17 00:00:00 2001
From: Isira Seneviratne <isirasen96@gmail.com>
Date: Fri, 25 Sep 2020 15:28:18 +0530
Subject: [PATCH] Replace Bluetooth PNGs with a vector drawable.

---
 .../org/fdroid/fdroid/nearby/StartSwapView.java   |  14 +++++++++-----
 .../fdroid/fdroid/nearby/peers/BluetoothPeer.java |   6 ++++--
 .../full/res/drawable-hdpi/ic_bluetooth_white.png | Bin 283 -> 0 bytes
 .../full/res/drawable-mdpi/ic_bluetooth_white.png | Bin 207 -> 0 bytes
 .../res/drawable-xhdpi/ic_bluetooth_white.png     | Bin 311 -> 0 bytes
 .../res/drawable-xxhdpi/ic_bluetooth_white.png    | Bin 455 -> 0 bytes
 .../res/drawable-xxxhdpi/ic_bluetooth_white.png   | Bin 532 -> 0 bytes
 app/src/full/res/drawable/ic_bluetooth.xml        |   5 +++++
 app/src/full/res/layout/swap_peer_list_item.xml   |   2 +-
 app/src/full/res/layout/swap_start_swap.xml       |   2 +-
 10 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 100644 app/src/full/res/drawable-hdpi/ic_bluetooth_white.png
 delete mode 100644 app/src/full/res/drawable-mdpi/ic_bluetooth_white.png
 delete mode 100644 app/src/full/res/drawable-xhdpi/ic_bluetooth_white.png
 delete mode 100644 app/src/full/res/drawable-xxhdpi/ic_bluetooth_white.png
 delete mode 100644 app/src/full/res/drawable-xxxhdpi/ic_bluetooth_white.png
 create mode 100644 app/src/full/res/drawable/ic_bluetooth.xml

diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
index 39bf1d89b..187fdecc6 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/StartSwapView.java
@@ -7,9 +7,6 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.net.wifi.WifiConfiguration;
-import androidx.annotation.Nullable;
-import androidx.localbroadcastmanager.content.LocalBroadcastManager;
-import androidx.appcompat.widget.SwitchCompat;
 import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
@@ -22,7 +19,12 @@ import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import cc.mvdan.accesspoint.WifiApControl;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.core.content.ContextCompat;
+import androidx.localbroadcastmanager.content.LocalBroadcastManager;
+
 import org.fdroid.fdroid.FDroidApp;
 import org.fdroid.fdroid.R;
 import org.fdroid.fdroid.Utils;
@@ -30,6 +32,8 @@ import org.fdroid.fdroid.nearby.peers.Peer;
 
 import java.util.ArrayList;
 
+import cc.mvdan.accesspoint.WifiApControl;
+
 @SuppressWarnings("LineLength")
 public class StartSwapView extends SwapView {
     private static final String TAG = "StartSwapView";
@@ -67,7 +71,7 @@ public class StartSwapView extends SwapView {
             Peer peer = getItem(position);
             ((TextView) convertView.findViewById(R.id.peer_name)).setText(peer.getName());
             ((ImageView) convertView.findViewById(R.id.icon))
-                    .setImageDrawable(getResources().getDrawable(peer.getIcon()));
+                    .setImageDrawable(ContextCompat.getDrawable(getContext(), peer.getIcon()));
 
             return convertView;
         }
diff --git a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
index 515853873..75d6f4fbc 100644
--- a/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
+++ b/app/src/full/java/org/fdroid/fdroid/nearby/peers/BluetoothPeer.java
@@ -3,8 +3,10 @@ package org.fdroid.fdroid.nearby.peers;
 import android.bluetooth.BluetoothClass.Device;
 import android.bluetooth.BluetoothDevice;
 import android.os.Parcel;
-import androidx.annotation.Nullable;
 import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
 import org.fdroid.fdroid.R;
 
 public class BluetoothPeer implements Peer {
@@ -44,7 +46,7 @@ public class BluetoothPeer implements Peer {
 
     @Override
     public int getIcon() {
-        return R.drawable.ic_bluetooth_white;
+        return R.drawable.ic_bluetooth;
     }
 
     @Override
diff --git a/app/src/full/res/drawable-hdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-hdpi/ic_bluetooth_white.png
deleted file mode 100644
index 95f1f121d5e7cef3a35a4b519efc00941aa46100..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 283
zcmV+$0p$LPP)<h;3K|Lk000e1NJLTq001Na001Ni1ONa4O9@aD0002uNkl<Zcmd_q
zF){=}6b4{D3FT0G1gGE@&?DgtvpZ8xL2)4oQlkAtJT)bldDYqeL5E-PzkcuNfTN<e
zf~c(^Y9lB?*(ft8L%FawC^P7DC1qm|L8;)*<0?wA1#FdoRL7pO)K2+3ey3gmXG^JF
zP(P5)1Q?^i<<zJLx2C|C7(tDIckltxT#iD5iHKGZUm{6mnD$UG%^Ql*=b1P0GU{^7
zpa;DHFzGT(tVsE#9(1dj^wQ3mfSh;%T;>lO_nsFq5$FG&+AqLWlj9#uA_2M12>~@=
h0=mfy0R?lI`34X*H~fhOV<`Xt002ovPDHLkV1g>jaghK3

diff --git a/app/src/full/res/drawable-mdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-mdpi/ic_bluetooth_white.png
deleted file mode 100644
index 32488bb017b250a5c60f6d63c8c1e95448dfed9e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 207
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iX`U{QAr*{AE;h0{8%nfZ)SH-d
zvC_(UwR6eFvW`7_a!+M))-AZs%*(V-`Ochwr5`M~`UF!Ry;&*xf$s?SZKVf79cjse
zKkk_q{B>1Z#<xp0dGAb)qJ19bji-!nCeL#`clCs&e1c1mb5mNvE6w%&yX)Dm&FIt5
zjB)aky7*v8VDoK9s|cZZ-OQ7_r)~KY;2y=cDqTW>fg$k2pG$|QidO+$$l&Sf=d#Wz
Gp$Py0*ii%k

diff --git a/app/src/full/res/drawable-xhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xhdpi/ic_bluetooth_white.png
deleted file mode 100644
index 42b50d697b3faad0248b47892723eafdd9f7aa05..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 311
zcmV-70m%M|P)<h;3K|Lk000e1NJLTq001xm001xu1ONa4{R=S+0002~Nkl<ZcmeI!
ziAlv^5JlkuyLk<WefU;eaW6%JSf0pEemH`1Vc^Q<WPm_!0p}wSl8J5W8UWATKqmps
z1T+)SOrX^Xu9!GFP$!iC0EP$yK8pkszZ;zX1g?t&Cx#ITh**|5JJ3XAAc9x4ncaVg
zb0RMG1a}POxecvG2v{iZ1X|ATqc$#y(CT?7e9Rm|s}qg+{LW|$<r@g)dx2wPUPNPF
zL}%WKdOk6;5w*NxXnX2}=kv#oL!GdE27ZW9B0O(DoENmgu9`Q18@|x)t9b)T`3T-T
zpMgqVhu6F16Oi%`ji;mK>+^gk@EFUlEw5R=33!UGDZg!9`v&E#j#c9lYqS6W002ov
JPDHLkV1gWRfwuqv

diff --git a/app/src/full/res/drawable-xxhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xxhdpi/ic_bluetooth_white.png
deleted file mode 100644
index ae9c74800bc097e44f94d3dc5bf04dcd673698fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 455
zcmV;&0XY7NP)<h;3K|Lk000e1NJLTq002k;002k`1ONa4|Kxkj0004wNkl<ZcmeF#
z3rfR46ougdC6iTX>vq(x$XfTK2u+_B*P?Y9<@F1dN5a7iO6KMQ`8UuHnn@0m#>U3t
z$4^huKygSAj0C|*5R3%DNDzz!!ARgvV#YI-0rDj=;{+^!BY^`+I4DU$z=x2EaR3@B
z8^l#%5-$KYiB>6bU6e#cW0C}PCVl#nR#X;fV3L5&G2vL2v{I4@s(Gi|jteJ}g2?RY
zwk0R62uVO>c11Y`X-y@^KC`9UMma@Ev{TMnIsKB>@`LR*t{f$4`j=|{B%9+(k~8QO
z8JpB7$DgE}AS4}f-X!IWAmIdkg8YxXa^k;*^eYyCqq8FbM~9gcXGyz8N#2}_b~@p9
z)Seujuu9rfJ92d7qog-#H;#gIFDa=UM?vSv9O!o7vN*>8-S9=Xhr%2S#MGT*fcoTU
zyxJTEG3D4BN8^^0a10QWo;ezKf4TG&&OG%W_y4{Yo(H%%7mj}hClKf{4Ob+Nf|TQ*
xaw35iY50T_2DJDd!{7jL=L`uj3P!;w002Wb0vpqQGq3;v002ovPDHLkV1g$d!D#>h

diff --git a/app/src/full/res/drawable-xxxhdpi/ic_bluetooth_white.png b/app/src/full/res/drawable-xxxhdpi/ic_bluetooth_white.png
deleted file mode 100644
index 1550d57ec0616d969b0d2420d792eef253800fa9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq003YB003YJ1ONa4NRhv@0005oNkl<ZcmeI&
z)p49L07YTFhib9CSXY=+R{R=<T8s^xke+rFpWy0hMz?^S^DX~S=H}++=H~v#pzg)!
zfKdrBH~|JHz~BTJoB)FpU~mEqPJqD)FgO813EbkCb<sf_q2_-8&Yb{(gqjaH0lE?-
zA1AQ8*Lx#)e%%G@-vC_iOyHQhHo*X;bSALoLI?uLCkP;)Ab@Pb#sQ-c1W*Z|Y3+Vz
zf&lChPB|?58JjBz3SiSO-w9g-czy_>4PYCR?*w)hmG6WWfGwBJ{G-xuY=1^zXHof1
zXvDVi&uV@o!RPtWgfkW;U_waBcf#dw<S&aamT;bz?}Yq(C*<cl;ha@Tm=h#_0_I!D
z@`aF|Z-n@KC#2^)VHuzAg!p_X#OFI9H~*a7oyy<pu>3W<I}}1ze)F`-Q4&G&TY&F`
zvnF8?m){1I!Xkkn`Eqi1$$4Lb<O`rXLGlGq$Ep)S^8fx4)18=nxybj1)}CbK3xFHh
z`2yeuZ&ULH&@aD^my$1le))CW<h|x!0pJGjXzgjK+bf}wFMxgL3!#xOfPnl;_;)w`
zJ&nKZQu4Dmc)kFhmHbJ5{v<ztlAk}x&)<Og0(f4=n&jtC^7AM8`P)bS+}zyU+}sz5
Wvd)~jt-&$?0000<MNUMnLSTZm=l@6m

diff --git a/app/src/full/res/drawable/ic_bluetooth.xml b/app/src/full/res/drawable/ic_bluetooth.xml
new file mode 100644
index 000000000..8ded8624f
--- /dev/null
+++ b/app/src/full/res/drawable/ic_bluetooth.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M17.71,7.71L12,2h-1v7.59L6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 11,14.41L11,22h1l5.71,-5.71 -4.3,-4.29 4.3,-4.29zM13,5.83l1.88,1.88L13,9.59L13,5.83zM14.88,16.29L13,18.17v-3.76l1.88,1.88z"/>
+</vector>
diff --git a/app/src/full/res/layout/swap_peer_list_item.xml b/app/src/full/res/layout/swap_peer_list_item.xml
index a284a3f2e..9f474e1cc 100644
--- a/app/src/full/res/layout/swap_peer_list_item.xml
+++ b/app/src/full/res/layout/swap_peer_list_item.xml
@@ -27,7 +27,7 @@
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_centerInParent="true"
-                tools:src="@drawable/ic_bluetooth_white"/>
+                tools:src="@drawable/ic_bluetooth"/>
 
     </RelativeLayout>
 
diff --git a/app/src/full/res/layout/swap_start_swap.xml b/app/src/full/res/layout/swap_start_swap.xml
index 4b25a4e79..1cb6c1774 100644
--- a/app/src/full/res/layout/swap_start_swap.xml
+++ b/app/src/full/res/layout/swap_start_swap.xml
@@ -27,7 +27,7 @@
                 android:layout_height="24dp"
                 android:tint="@color/swap_grey_icon"
                 android:contentDescription="@string/use_bluetooth"
-                android:src="@drawable/ic_bluetooth_white"/>
+                android:src="@drawable/ic_bluetooth"/>
 
         <LinearLayout
                 android:layout_width="0dp"