Use drawable compat tint for task edit icons

pull/322/head
Alex Baker 10 years ago
parent 7ad18a7c4d
commit abd3645b4b

@ -10,9 +10,11 @@ import android.app.Dialog;
import android.content.ContentValues;
import android.content.DialogInterface;
import android.content.Intent;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
import android.support.v4.graphics.drawable.DrawableCompat;
import android.support.v4.view.ViewPager;
import android.text.TextUtils;
import android.view.KeyEvent;
@ -84,7 +86,6 @@ import org.tasks.location.GeofenceService;
import org.tasks.notifications.NotificationManager;
import org.tasks.preferences.ActivityPreferences;
import org.tasks.preferences.DeviceInfo;
import org.tasks.preferences.ResourceResolver;
import org.tasks.ui.DeadlineControlSet;
import java.io.File;
@ -175,7 +176,6 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
@Inject TagDataDao tagDataDao;
@Inject ActFmCameraModule actFmCameraModule;
@Inject GeofenceService geofenceService;
@Inject ResourceResolver resourceResolver;
@Inject DeviceInfo deviceInfo;
@Inject DialogBuilder dialogBuilder;
@ -446,7 +446,11 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
if (controlSet != null) {
ImageView icon = (ImageView) controlSet.findViewById(R.id.icon);
if (icon != null) {
icon.setImageResource(resourceResolver.getResource(curr.getIcon()));
Drawable drawable = getResources().getDrawable(curr.getIcon());
if (preferences.isDarkTheme()) {
drawable = whiteTint(drawable);
}
icon.setImageDrawable(drawable);
}
basicControls.addView(controlSet);
}
@ -460,6 +464,12 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
getActivity().getIntent().removeExtra(TOKEN_OPEN_CONTROL);
}
private Drawable whiteTint(Drawable drawable) {
Drawable wrapDrawable = DrawableCompat.wrap(drawable);
DrawableCompat.setTint(wrapDrawable, getResources().getColor(android.R.color.white));
return wrapDrawable;
}
/**
* Initialize task edit page in the background
*

@ -80,7 +80,7 @@ public class FilesControlSet extends PopupControlSet {
@Override
public int getIcon() {
return R.attr.ic_action_attachment;
return R.drawable.ic_attachment_black_24dp;
}
public void refreshMetadata() {

@ -247,6 +247,6 @@ public class GCalControlSet extends TaskEditControlSetBase {
@Override
public int getIcon() {
return R.attr.ic_action_calendar_month;
return R.drawable.ic_event_black_24dp;
}
}

@ -201,7 +201,7 @@ public class RepeatControlSet extends PopupControlSet {
@Override
public int getIcon() {
return R.attr.ic_action_reload;
return R.drawable.ic_repeat_black_24dp;
}
@Override

@ -252,7 +252,7 @@ public final class TagsControlSet extends PopupControlSet {
@Override
public int getIcon() {
return R.attr.ic_action_tags;
return R.drawable.ic_label_black_24dp;
}
@Override

@ -67,7 +67,7 @@ public class TimerControlSet extends PopupControlSet implements TimerActionListe
@Override
public int getIcon() {
return R.attr.ic_timer;
return R.drawable.ic_timer_black_24dp;
}
// --- TimeDurationTaskEditControlSet

@ -38,6 +38,6 @@ public class DescriptionControlSet extends TaskEditControlSetBase {
@Override
public int getIcon() {
return R.attr.ic_action_list;
return R.drawable.ic_event_note_black_24dp;
}
}

@ -232,7 +232,7 @@ public class HideUntilControlSet extends TaskEditControlSetBase implements OnIte
@Override
public int getIcon() {
return R.attr.ic_action_box;
return R.drawable.ic_visibility_off_black_24dp;
}
@Override

@ -133,7 +133,7 @@ public class ImportanceControlSet extends TaskEditControlSetBase {
@Override
public int getIcon() {
return R.attr.ic_action_flag;
return R.drawable.ic_flag_black_24dp;
}
// Same as above because we need the setImportance listeners to fire even in

@ -394,6 +394,6 @@ public class ReminderControlSet extends TaskEditControlSetBase implements Adapte
@Override
public int getIcon() {
return R.attr.ic_action_bell;
return R.drawable.ic_notifications_black_24dp;
}
}

@ -451,6 +451,6 @@ public class DeadlineControlSet extends TaskEditControlSetBase {
@Override
public int getIcon() {
return R.attr.ic_action_clock;
return R.drawable.ic_schedule_black_24dp;
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 144 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 198 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 575 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 499 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 545 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 193 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 279 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 185 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 737 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 660 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 261 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 254 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 168 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 410 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 901 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 939 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 131 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 100 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 177 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 133 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 377 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 329 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 365 B

@ -28,16 +28,6 @@
<attr name="asTaskRowSelector" format="reference" />
<attr name="ic_action_cancel" format="reference" />
<attr name="ic_action_settings" format="reference" />
<attr name="ic_action_attachment" format="reference" />
<attr name="ic_action_clock" format="reference" />
<attr name="ic_action_flag" format="reference" />
<attr name="ic_action_tags" format="reference" />
<attr name="ic_action_list" format="reference" />
<attr name="ic_action_box" format="reference" />
<attr name="ic_action_bell" format="reference" />
<attr name="ic_timer" format="reference" />
<attr name="ic_action_reload" format="reference" />
<attr name="ic_action_calendar_month" format="reference" />
<attr name="ic_action_calendar_today" format="reference" />
<attr name="ic_action_history" format="reference" />
<attr name="ic_action_uncategorized" format="reference" />

@ -26,16 +26,6 @@
<item name="asAbBackgroundColor">@android:color/black</item>
<item name="ic_action_settings">@drawable/ic_settings_white_24dp</item>
<item name="task_edit_divider">@color/task_edit_divider_dark</item>
<item name="ic_action_attachment">@drawable/ic_attachment_white_24dp</item>
<item name="ic_action_clock">@drawable/ic_schedule_white_24dp</item>
<item name="ic_action_flag">@drawable/ic_flag_white_24dp</item>
<item name="ic_action_tags">@drawable/ic_label_white_24dp</item>
<item name="ic_action_list">@drawable/ic_event_note_white_24dp</item>
<item name="ic_action_box">@drawable/ic_visibility_off_white_24dp</item>
<item name="ic_action_bell">@drawable/ic_notifications_white_24dp</item>
<item name="ic_timer">@drawable/ic_timer_white_24dp</item>
<item name="ic_action_reload">@drawable/ic_repeat_white_24dp</item>
<item name="ic_action_calendar_month">@drawable/ic_event_white_24dp</item>
<item name="ic_action_cancel">@drawable/ic_close_white_24dp</item>
<item name="asDueDateColor">#c3c3c3</item>
<item name="fab_icon">@drawable/ic_add_black_24dp</item>

@ -42,16 +42,6 @@
<item name="asAbBackgroundColor">#607d8b</item>
<item name="importance_background_selected">@drawable/importance_background_selected</item>
<item name="task_edit_divider">@color/task_edit_divider</item>
<item name="ic_action_attachment">@drawable/ic_attachment_black_24dp</item>
<item name="ic_action_clock">@drawable/ic_schedule_black_24dp</item>
<item name="ic_action_flag">@drawable/ic_flag_black_24dp</item>
<item name="ic_action_tags">@drawable/ic_label_black_24dp</item>
<item name="ic_action_list">@drawable/ic_event_note_black_24dp</item>
<item name="ic_action_box">@drawable/ic_visibility_off_black_24dp</item>
<item name="ic_action_bell">@drawable/ic_notifications_black_24dp</item>
<item name="ic_timer">@drawable/ic_timer_black_24dp</item>
<item name="ic_action_reload">@drawable/ic_repeat_black_24dp</item>
<item name="ic_action_calendar_month">@drawable/ic_event_black_24dp</item>
<item name="fab_icon">@drawable/ic_add_white_24dp</item>
<item name="ic_action_inbox">@drawable/ic_inbox_black_24dp</item>
<item name="ic_action_help">@drawable/ic_help_black_24dp</item>

Loading…
Cancel
Save