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 335516840..000000000 Binary files a/res/drawable-hdpi/ic_menu_remove_holo_light.png and /dev/null differ 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 e1cf30f90..000000000 Binary files a/res/drawable-mdpi/ic_menu_remove_holo_light.png and /dev/null differ 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 e2fb7f1f9..000000000 Binary files a/res/drawable-xhdpi/ic_menu_remove_holo_light.png and /dev/null differ 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 3579fe01a..000000000 Binary files a/res/drawable-xxhdpi/ic_menu_remove_holo_light.png and /dev/null differ 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" /> \ 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) {