diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 1c4398f6f..84b1980d6 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -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 * diff --git a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java index 11e324d97..982c8b870 100644 --- a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java +++ b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java @@ -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() { diff --git a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java index 5feec4c3f..c528f4fc0 100644 --- a/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java @@ -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; } } diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index e852dede1..64cd26784 100644 --- a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -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 diff --git a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java index b971d6050..15012cf25 100644 --- a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java +++ b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java @@ -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 diff --git a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java index d043dbc57..89f3c1157 100644 --- a/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java +++ b/src/main/java/com/todoroo/astrid/timers/TimerControlSet.java @@ -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 diff --git a/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java index ff1250f64..857164171 100644 --- a/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/DescriptionControlSet.java @@ -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; } } diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index 3b6f2cd4a..9c79adf28 100644 --- a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -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 diff --git a/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java b/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java index 53b652bb6..9d4474346 100644 --- a/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java @@ -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 diff --git a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java index 1085198f9..4313c5d78 100644 --- a/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java @@ -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; } } diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java index ef34aae81..3d7ce8988 100644 --- a/src/main/java/org/tasks/ui/DeadlineControlSet.java +++ b/src/main/java/org/tasks/ui/DeadlineControlSet.java @@ -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; } } diff --git a/src/main/res/drawable-hdpi/ic_event_note_white_24dp.png b/src/main/res/drawable-hdpi/ic_event_note_white_24dp.png deleted file mode 100644 index 4f66a86c3..000000000 Binary files a/src/main/res/drawable-hdpi/ic_event_note_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_event_white_24dp.png b/src/main/res/drawable-hdpi/ic_event_white_24dp.png deleted file mode 100644 index e6b1f0079..000000000 Binary files a/src/main/res/drawable-hdpi/ic_event_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_flag_white_24dp.png b/src/main/res/drawable-hdpi/ic_flag_white_24dp.png deleted file mode 100644 index f0f86ad04..000000000 Binary files a/src/main/res/drawable-hdpi/ic_flag_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png deleted file mode 100644 index c6dc08ef9..000000000 Binary files a/src/main/res/drawable-hdpi/ic_notifications_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png b/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png deleted file mode 100644 index 81c5be793..000000000 Binary files a/src/main/res/drawable-hdpi/ic_repeat_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_schedule_white_24dp.png b/src/main/res/drawable-hdpi/ic_schedule_white_24dp.png deleted file mode 100644 index f3581d104..000000000 Binary files a/src/main/res/drawable-hdpi/ic_schedule_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_timer_white_24dp.png b/src/main/res/drawable-hdpi/ic_timer_white_24dp.png deleted file mode 100644 index 10619fc8c..000000000 Binary files a/src/main/res/drawable-hdpi/ic_timer_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_visibility_off_white_24dp.png b/src/main/res/drawable-hdpi/ic_visibility_off_white_24dp.png deleted file mode 100644 index 06f4e33c4..000000000 Binary files a/src/main/res/drawable-hdpi/ic_visibility_off_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_event_note_white_24dp.png b/src/main/res/drawable-xhdpi/ic_event_note_white_24dp.png deleted file mode 100644 index 4f3426bdf..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_event_note_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_event_white_24dp.png b/src/main/res/drawable-xhdpi/ic_event_white_24dp.png deleted file mode 100644 index 5356f8220..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_event_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png b/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png deleted file mode 100644 index 23c4bb7f0..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_flag_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png deleted file mode 100644 index 2be5c1182..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_notifications_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png b/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png deleted file mode 100644 index ad8b8c0df..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_repeat_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_schedule_white_24dp.png b/src/main/res/drawable-xhdpi/ic_schedule_white_24dp.png deleted file mode 100644 index 2e27936a4..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_schedule_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png b/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png deleted file mode 100644 index 9d239966f..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_visibility_off_white_24dp.png b/src/main/res/drawable-xhdpi/ic_visibility_off_white_24dp.png deleted file mode 100644 index 93bea7dfa..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_visibility_off_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_event_note_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_event_note_white_24dp.png deleted file mode 100644 index 4f85626f7..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_event_note_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_event_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_event_white_24dp.png deleted file mode 100644 index 0bcfe5b68..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_event_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png deleted file mode 100644 index fb2bc30ce..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_flag_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png deleted file mode 100644 index 78d97a53f..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_notifications_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png deleted file mode 100644 index 5de7a2951..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_repeat_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_schedule_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_schedule_white_24dp.png deleted file mode 100644 index bfc72736a..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_schedule_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png deleted file mode 100644 index bb6f9a63b..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png deleted file mode 100644 index 6fc6300c6..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_visibility_off_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable/ic_event_note_white_24dp.png b/src/main/res/drawable/ic_event_note_white_24dp.png deleted file mode 100644 index f21ac22de..000000000 Binary files a/src/main/res/drawable/ic_event_note_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable/ic_event_white_24dp.png b/src/main/res/drawable/ic_event_white_24dp.png deleted file mode 100644 index 35d8b1b31..000000000 Binary files a/src/main/res/drawable/ic_event_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable/ic_flag_white_24dp.png b/src/main/res/drawable/ic_flag_white_24dp.png deleted file mode 100644 index 0d2c5f65c..000000000 Binary files a/src/main/res/drawable/ic_flag_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable/ic_notifications_white_24dp.png b/src/main/res/drawable/ic_notifications_white_24dp.png deleted file mode 100644 index 8a9faffb6..000000000 Binary files a/src/main/res/drawable/ic_notifications_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable/ic_repeat_white_24dp.png b/src/main/res/drawable/ic_repeat_white_24dp.png deleted file mode 100644 index b1c2e04ab..000000000 Binary files a/src/main/res/drawable/ic_repeat_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable/ic_schedule_white_24dp.png b/src/main/res/drawable/ic_schedule_white_24dp.png deleted file mode 100644 index 501ee842e..000000000 Binary files a/src/main/res/drawable/ic_schedule_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable/ic_timer_white_24dp.png b/src/main/res/drawable/ic_timer_white_24dp.png deleted file mode 100644 index 72e1320c4..000000000 Binary files a/src/main/res/drawable/ic_timer_white_24dp.png and /dev/null differ diff --git a/src/main/res/drawable/ic_visibility_off_white_24dp.png b/src/main/res/drawable/ic_visibility_off_white_24dp.png deleted file mode 100644 index f228b94cf..000000000 Binary files a/src/main/res/drawable/ic_visibility_off_white_24dp.png and /dev/null differ diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index 7c95a4d40..3c7d338db 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -28,16 +28,6 @@ - - - - - - - - - - diff --git a/src/main/res/values/styles_dark.xml b/src/main/res/values/styles_dark.xml index 2f4f7ba0f..dbdb8223a 100644 --- a/src/main/res/values/styles_dark.xml +++ b/src/main/res/values/styles_dark.xml @@ -26,16 +26,6 @@ @android:color/black @drawable/ic_settings_white_24dp @color/task_edit_divider_dark - @drawable/ic_attachment_white_24dp - @drawable/ic_schedule_white_24dp - @drawable/ic_flag_white_24dp - @drawable/ic_label_white_24dp - @drawable/ic_event_note_white_24dp - @drawable/ic_visibility_off_white_24dp - @drawable/ic_notifications_white_24dp - @drawable/ic_timer_white_24dp - @drawable/ic_repeat_white_24dp - @drawable/ic_event_white_24dp @drawable/ic_close_white_24dp #c3c3c3 @drawable/ic_add_black_24dp diff --git a/src/main/res/values/styles_light.xml b/src/main/res/values/styles_light.xml index cba34cd7b..f44451ebd 100644 --- a/src/main/res/values/styles_light.xml +++ b/src/main/res/values/styles_light.xml @@ -42,16 +42,6 @@ #607d8b @drawable/importance_background_selected @color/task_edit_divider - @drawable/ic_attachment_black_24dp - @drawable/ic_schedule_black_24dp - @drawable/ic_flag_black_24dp - @drawable/ic_label_black_24dp - @drawable/ic_event_note_black_24dp - @drawable/ic_visibility_off_black_24dp - @drawable/ic_notifications_black_24dp - @drawable/ic_timer_black_24dp - @drawable/ic_repeat_black_24dp - @drawable/ic_event_black_24dp @drawable/ic_add_white_24dp @drawable/ic_inbox_black_24dp @drawable/ic_help_black_24dp