From 631fa8a1d8c444e550295786cb0ba5da978dfc7a Mon Sep 17 00:00:00 2001
From: "B. Petersen" <r10s@b44t.com>
Date: Fri, 5 Apr 2019 11:03:32 +0200
Subject: [PATCH] tweak member-delete icon for dark-theme

---
 res/drawable-hdpi/ic_menu_remove_holo_light.png   | Bin 220 -> 0 bytes
 res/drawable-mdpi/ic_menu_remove_holo_light.png   | Bin 159 -> 0 bytes
 res/drawable-xhdpi/ic_menu_remove_holo_light.png  | Bin 245 -> 0 bytes
 res/drawable-xxhdpi/ic_menu_remove_holo_light.png | Bin 308 -> 0 bytes
 res/layout/selected_recipient_list_item.xml       |   2 +-
 .../thoughtcrime/securesms/util/DynamicTheme.java |   5 +++--
 .../securesms/util/SelectedRecipientsAdapter.java |   2 ++
 7 files changed, 6 insertions(+), 3 deletions(-)
 delete mode 100644 res/drawable-hdpi/ic_menu_remove_holo_light.png
 delete mode 100644 res/drawable-mdpi/ic_menu_remove_holo_light.png
 delete mode 100644 res/drawable-xhdpi/ic_menu_remove_holo_light.png
 delete mode 100644 res/drawable-xxhdpi/ic_menu_remove_holo_light.png

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

literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDB3?!H8JlO)IgaUj*T!FMPD#(|~dI}U}D+%%o
zW|+xU<D4MI;AaOEDfV=645^5Fdg&l%g8`32pr(bxMMjp`1$Q0P3;t(*`Q-Uf-pHYt
z`>glv38~*Im|~P8wlfFZvToR2b|CV*ybGIV?<|kSE-VU60*oCDE(}Txf(;xFM-H&(
zO^ti^e3|?gk4uVGZ`gp64IS6iBQ4gxc=D04@rtPY0?`+2K<gPiUHx3vIVCg!0BM*-
AQvd(}

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

literal 159
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE0wix1Z>k4UX`U{QAs)w*6C_v<^GifaeV0D{
zXv$R9Q&Er17u>H<(^Echt8vp0-U&xjS@I+oi3qKg-JLXPOLCS%r1dJbO<NXAIL<3m
zQ9g0iZzH2fRpTLtB?eNOJ{}@!sa?jxPjAk=#FQ$+<IBLX@KCH_@Q)3Dfi^ODy85}S
Ib4q9e0C-t8&j0`b

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

literal 245
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I3?%1nZ+ru!_yc@GT!FMP5-51SA0)+E666=m
zFf*ZsOLO&}XrRCZPZ!6Kid%1|S@Rt*;Bd}9@%Q|lym_-c>b%+ZJWAKJKVdA@t9SL)
zt*NW8cTUeb?A_jSZTYPaLH|Q@1Lt-<Z<(@P_i3(AWpwbpXH&M@KIL7qXW|s|DW8r7
z-Q#?AnB}u$)6am^d2An4Klna5enMYp|EWKQAD^F*=E~39v+~onbL`x5xfMGeeeAQB
g_|Xlt>D?9XeRr91b2NRqfo@~)boFyt=akR{01v8VTL1t6

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

literal 308
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeE3?v1%WpM*3{s5m4S0HVS1PY$-e*+X^EeY}q
zW|&#SW%)}fQWGd}-qXb~q$2L^wS&Be3<OvMT{02`SsQ#9HAETyinEIE=viy|=k>qU
zqWf9i+_n94`DKaK`{O(}-f2GwNoITVHHKlmm4C<Eu<4=!rfCkk9m!XxD+GjImp`zS
zk>PfNZy94E11F=0ghNw<080<hkqoK~5{wR<3~meoObvnzQ$Rw>K%oO13{DIMO%3(}
z`zO_x{Mr0VUR<8nzUJe{Z`>mBf%;5^Ge0_sP5072R=D$fo6vTh{I1H|Uyse}=d+vh
n<Z(ZL#7~ar&PmHJzpP<67;VNMskJN*=rsmUS3j3^P6<r_Z6aux

diff --git a/res/layout/selected_recipient_list_item.xml b/res/layout/selected_recipient_list_item.xml
index 4ef65831f..c010e5ba1 100644
--- a/res/layout/selected_recipient_list_item.xml
+++ b/res/layout/selected_recipient_list_item.xml
@@ -29,6 +29,6 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:background="#00ffffff"
-        android:src="@drawable/ic_menu_remove_holo_light" />
+        android:src="@drawable/ic_close_white_24dp" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/src/org/thoughtcrime/securesms/util/DynamicTheme.java b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
index 3d6c66686..0ff7c780e 100644
--- a/src/org/thoughtcrime/securesms/util/DynamicTheme.java
+++ b/src/org/thoughtcrime/securesms/util/DynamicTheme.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 
 import org.thoughtcrime.securesms.R;
@@ -35,8 +36,8 @@ public class DynamicTheme {
     return R.style.TextSecure_LightTheme;
   }
 
-  public static boolean isDarkTheme(Activity activity) {
-    return Prefs.getTheme(activity).equals(DARK);
+  public static boolean isDarkTheme(Context context) {
+    return Prefs.getTheme(context).equals(DARK);
   }
 
   private static final class OverridePendingTransition {
diff --git a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
index 87842cf37..fbcc2326c 100644
--- a/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
+++ b/src/org/thoughtcrime/securesms/util/SelectedRecipientsAdapter.java
@@ -1,6 +1,7 @@
 package org.thoughtcrime.securesms.util;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.view.LayoutInflater;
@@ -117,6 +118,7 @@ public class SelectedRecipientsAdapter extends BaseAdapter {
     name.setText(dcContact.getDisplayName());
     phone.setText(dcContact.getAddr());
     delete.setVisibility(modifiable ? View.VISIBLE : View.GONE);
+    delete.setColorFilter(DynamicTheme.isDarkTheme(context)? Color.WHITE : Color.BLACK);
     delete.setOnClickListener(new View.OnClickListener() {
       @Override
       public void onClick(View view) {