From d918cc73d472aeca2b47fad705992ca1cafb42d1 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Sun, 4 Oct 2015 15:32:48 -0600 Subject: [PATCH] Use vector images --- .travis.yml | 4 +- build.gradle | 5 +- .../astrid/actfm/FilterSettingsActivity.java | 8 +- .../astrid/actfm/TagSettingsActivity.java | 8 +- .../activity/FilterShortcutActivity.java | 2 +- .../astrid/activity/TaskEditActivity.java | 24 ++- .../astrid/activity/TaskEditFragment.java | 16 +- .../astrid/activity/TaskListActivity.java | 8 +- .../todoroo/astrid/adapter/FilterAdapter.java | 31 +--- .../astrid/core/BuiltInFilterExposer.java | 8 +- .../astrid/core/CustomFilterActivity.java | 8 +- .../astrid/core/CustomFilterExposer.java | 2 +- .../com/todoroo/astrid/files/FileExplore.java | 8 +- .../todoroo/astrid/files/FilesControlSet.java | 2 +- .../todoroo/astrid/gcal/GCalControlSet.java | 2 +- .../astrid/gtasks/GtasksFilterExposer.java | 2 +- .../astrid/repeats/RepeatControlSet.java | 2 +- .../todoroo/astrid/tags/TagFilterExposer.java | 2 +- .../todoroo/astrid/tags/TagsControlSet.java | 5 +- .../astrid/timers/TimerControlSet.java | 2 +- .../astrid/ui/DescriptionControlSet.java | 2 +- .../astrid/ui/HideUntilControlSet.java | 2 +- .../astrid/ui/ImportanceControlSet.java | 2 +- .../todoroo/astrid/ui/ReminderControlSet.java | 2 +- .../astrid/widget/WidgetConfigActivity.java | 2 +- src/main/java/org/tasks/Notifier.java | 1 - .../activities/FilterSelectionActivity.java | 2 +- .../InjectingPreferenceActivity.java | 6 +- .../tasks/preferences/ResourceResolver.java | 1 + .../java/org/tasks/ui/DeadlineControlSet.java | 2 +- src/main/java/org/tasks/ui/MenuColorizer.java | 156 ++++++++++++++++++ .../tasks/ui/NavigationDrawerFragment.java | 6 +- .../res/drawable-hdpi/ic_add_black_24dp.png | Bin 124 -> 0 bytes .../ic_arrow_back_black_24dp.png | Bin 147 -> 0 bytes .../ic_arrow_back_white_24dp.png | Bin 152 -> 0 bytes .../ic_attach_money_black_24dp.png | Bin 395 -> 0 bytes .../ic_attachment_black_24dp.png | Bin 295 -> 0 bytes .../ic_attachment_white_24dp.png | Bin 299 -> 0 bytes .../drawable-hdpi/ic_cancel_black_24dp.png | Bin 397 -> 0 bytes .../drawable-hdpi/ic_cancel_white_24dp.png | Bin 414 -> 0 bytes .../res/drawable-hdpi/ic_close_black_24dp.png | Bin 207 -> 0 bytes .../res/drawable-hdpi/ic_close_white_24dp.png | Bin 221 -> 0 bytes .../ic_cloud_queue_black_24dp.png | Bin 433 -> 0 bytes .../drawable-hdpi/ic_delete_white_24dp.png | Bin 161 -> 0 bytes .../res/drawable-hdpi/ic_event_black_24dp.png | Bin 140 -> 0 bytes .../ic_event_note_black_24dp.png | Bin 143 -> 0 bytes .../ic_filter_list_black_24dp.png | Bin 107 -> 0 bytes .../res/drawable-hdpi/ic_flag_black_24dp.png | Bin 130 -> 0 bytes .../drawable-hdpi/ic_folder_black_24dp.png | Bin 131 -> 0 bytes .../res/drawable-hdpi/ic_help_black_24dp.png | Bin 458 -> 0 bytes .../drawable-hdpi/ic_history_black_24dp.png | Bin 493 -> 0 bytes .../res/drawable-hdpi/ic_inbox_black_24dp.png | Bin 261 -> 0 bytes .../ic_insert_drive_file_black_24dp.png | Bin 149 -> 0 bytes .../res/drawable-hdpi/ic_label_black_24dp.png | Bin 228 -> 0 bytes .../ic_label_outline_black_24dp.png | Bin 277 -> 0 bytes .../res/drawable-hdpi/ic_menu_white_24dp.png | Bin 92 -> 0 bytes .../res/drawable-hdpi/ic_mic_white_24dp.png | Bin 363 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 251 -> 0 bytes .../res/drawable-hdpi/ic_phone_black_24dp.png | Bin 326 -> 0 bytes .../drawable-hdpi/ic_repeat_black_24dp.png | Bin 183 -> 0 bytes .../res/drawable-hdpi/ic_save_white_24dp.png | Bin 247 -> 0 bytes .../drawable-hdpi/ic_schedule_black_24dp.png | Bin 541 -> 0 bytes .../drawable-hdpi/ic_search_white_24dp.png | Bin 396 -> 0 bytes .../drawable-hdpi/ic_settings_black_24dp.png | Bin 453 -> 0 bytes .../drawable-hdpi/ic_settings_white_24dp.png | Bin 460 -> 0 bytes .../res/drawable-hdpi/ic_sort_white_24dp.png | Bin 115 -> 0 bytes .../res/drawable-hdpi/ic_timer_black_24dp.png | Bin 504 -> 0 bytes .../res/drawable-hdpi/ic_today_black_24dp.png | Bin 191 -> 0 bytes .../ic_visibility_off_black_24dp.png | Bin 507 -> 0 bytes .../res/drawable-xhdpi/ic_add_black_24dp.png | Bin 108 -> 0 bytes .../ic_arrow_back_black_24dp.png | Bin 146 -> 0 bytes .../ic_arrow_back_white_24dp.png | Bin 151 -> 0 bytes .../ic_attach_money_black_24dp.png | Bin 428 -> 0 bytes .../ic_attachment_black_24dp.png | Bin 399 -> 0 bytes .../ic_attachment_white_24dp.png | Bin 403 -> 0 bytes .../drawable-xhdpi/ic_cancel_black_24dp.png | Bin 517 -> 0 bytes .../drawable-xhdpi/ic_cancel_white_24dp.png | Bin 536 -> 0 bytes .../drawable-xhdpi/ic_close_black_24dp.png | Bin 235 -> 0 bytes .../drawable-xhdpi/ic_close_white_24dp.png | Bin 257 -> 0 bytes .../ic_cloud_queue_black_24dp.png | Bin 534 -> 0 bytes .../drawable-xhdpi/ic_delete_white_24dp.png | Bin 151 -> 0 bytes .../drawable-xhdpi/ic_event_black_24dp.png | Bin 188 -> 0 bytes .../ic_event_note_black_24dp.png | Bin 192 -> 0 bytes .../ic_filter_list_black_24dp.png | Bin 103 -> 0 bytes .../res/drawable-xhdpi/ic_flag_black_24dp.png | Bin 130 -> 0 bytes .../drawable-xhdpi/ic_folder_black_24dp.png | Bin 180 -> 0 bytes .../res/drawable-xhdpi/ic_help_black_24dp.png | Bin 579 -> 0 bytes .../drawable-xhdpi/ic_history_black_24dp.png | Bin 619 -> 0 bytes .../drawable-xhdpi/ic_inbox_black_24dp.png | Bin 274 -> 0 bytes .../ic_insert_drive_file_black_24dp.png | Bin 197 -> 0 bytes .../drawable-xhdpi/ic_label_black_24dp.png | Bin 278 -> 0 bytes .../ic_label_outline_black_24dp.png | Bin 335 -> 0 bytes .../res/drawable-xhdpi/ic_menu_white_24dp.png | Bin 93 -> 0 bytes .../res/drawable-xhdpi/ic_mic_white_24dp.png | Bin 436 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 275 -> 0 bytes .../drawable-xhdpi/ic_phone_black_24dp.png | Bin 408 -> 0 bytes .../drawable-xhdpi/ic_repeat_black_24dp.png | Bin 168 -> 0 bytes .../res/drawable-xhdpi/ic_save_white_24dp.png | Bin 273 -> 0 bytes .../drawable-xhdpi/ic_schedule_black_24dp.png | Bin 690 -> 0 bytes .../drawable-xhdpi/ic_search_white_24dp.png | Bin 465 -> 0 bytes .../drawable-xhdpi/ic_settings_black_24dp.png | Bin 557 -> 0 bytes .../drawable-xhdpi/ic_settings_white_24dp.png | Bin 562 -> 0 bytes .../res/drawable-xhdpi/ic_sort_white_24dp.png | Bin 101 -> 0 bytes .../drawable-xhdpi/ic_timer_black_24dp.png | Bin 616 -> 0 bytes .../drawable-xhdpi/ic_today_black_24dp.png | Bin 186 -> 0 bytes .../ic_visibility_off_black_24dp.png | Bin 629 -> 0 bytes .../res/drawable-xxhdpi/ic_add_black_24dp.png | Bin 114 -> 0 bytes .../ic_arrow_back_black_24dp.png | Bin 179 -> 0 bytes .../ic_arrow_back_white_24dp.png | Bin 188 -> 0 bytes .../ic_attach_money_black_24dp.png | Bin 611 -> 0 bytes .../ic_attachment_black_24dp.png | Bin 610 -> 0 bytes .../ic_attachment_white_24dp.png | Bin 631 -> 0 bytes .../drawable-xxhdpi/ic_cancel_black_24dp.png | Bin 721 -> 0 bytes .../drawable-xxhdpi/ic_cancel_white_24dp.png | Bin 751 -> 0 bytes .../drawable-xxhdpi/ic_close_black_24dp.png | Bin 309 -> 0 bytes .../drawable-xxhdpi/ic_close_white_24dp.png | Bin 347 -> 0 bytes .../ic_cloud_queue_black_24dp.png | Bin 784 -> 0 bytes .../drawable-xxhdpi/ic_delete_white_24dp.png | Bin 194 -> 0 bytes .../drawable-xxhdpi/ic_event_black_24dp.png | Bin 245 -> 0 bytes .../ic_event_note_black_24dp.png | Bin 250 -> 0 bytes .../ic_filter_list_black_24dp.png | Bin 112 -> 0 bytes .../drawable-xxhdpi/ic_flag_black_24dp.png | Bin 163 -> 0 bytes .../drawable-xxhdpi/ic_folder_black_24dp.png | Bin 239 -> 0 bytes .../drawable-xxhdpi/ic_help_black_24dp.png | Bin 834 -> 0 bytes .../drawable-xxhdpi/ic_history_black_24dp.png | Bin 898 -> 0 bytes .../drawable-xxhdpi/ic_inbox_black_24dp.png | Bin 377 -> 0 bytes .../ic_insert_drive_file_black_24dp.png | Bin 273 -> 0 bytes .../drawable-xxhdpi/ic_label_black_24dp.png | Bin 370 -> 0 bytes .../ic_label_outline_black_24dp.png | Bin 444 -> 0 bytes .../drawable-xxhdpi/ic_menu_white_24dp.png | Bin 95 -> 0 bytes .../res/drawable-xxhdpi/ic_mic_white_24dp.png | Bin 606 -> 0 bytes .../ic_notifications_black_24dp.png | Bin 400 -> 0 bytes .../drawable-xxhdpi/ic_phone_black_24dp.png | Bin 574 -> 0 bytes .../drawable-xxhdpi/ic_repeat_black_24dp.png | Bin 214 -> 0 bytes .../drawable-xxhdpi/ic_save_white_24dp.png | Bin 391 -> 0 bytes .../ic_schedule_black_24dp.png | Bin 1038 -> 0 bytes .../drawable-xxhdpi/ic_search_white_24dp.png | Bin 728 -> 0 bytes .../ic_settings_black_24dp.png | Bin 827 -> 0 bytes .../ic_settings_white_24dp.png | Bin 843 -> 0 bytes .../drawable-xxhdpi/ic_sort_white_24dp.png | Bin 103 -> 0 bytes .../drawable-xxhdpi/ic_timer_black_24dp.png | Bin 877 -> 0 bytes .../drawable-xxhdpi/ic_today_black_24dp.png | Bin 247 -> 0 bytes .../ic_visibility_off_black_24dp.png | Bin 884 -> 0 bytes src/main/res/drawable/ic_add_24dp.xml | 6 + src/main/res/drawable/ic_add_black_24dp.png | Bin 86 -> 0 bytes src/main/res/drawable/ic_arrow_back_24dp.xml | 6 + .../res/drawable/ic_arrow_back_black_24dp.png | Bin 114 -> 0 bytes .../res/drawable/ic_arrow_back_white_24dp.png | Bin 118 -> 0 bytes .../res/drawable/ic_attach_money_24dp.xml | 6 + .../drawable/ic_attach_money_black_24dp.png | Bin 243 -> 0 bytes src/main/res/drawable/ic_attachment_24dp.xml | 6 + .../res/drawable/ic_attachment_black_24dp.png | Bin 229 -> 0 bytes .../res/drawable/ic_attachment_white_24dp.png | Bin 245 -> 0 bytes src/main/res/drawable/ic_cancel_24dp.xml | 6 + .../res/drawable/ic_cancel_black_24dp.png | Bin 291 -> 0 bytes .../res/drawable/ic_cancel_white_24dp.png | Bin 304 -> 0 bytes src/main/res/drawable/ic_check_24dp.xml | 6 + src/main/res/drawable/ic_close_24dp.xml | 6 + src/main/res/drawable/ic_close_black_24dp.png | Bin 164 -> 0 bytes src/main/res/drawable/ic_close_white_24dp.png | Bin 175 -> 0 bytes src/main/res/drawable/ic_cloud_queue_24dp.xml | 6 + .../drawable/ic_cloud_queue_black_24dp.png | Bin 279 -> 0 bytes src/main/res/drawable/ic_delete_24dp.xml | 6 + .../res/drawable/ic_delete_white_24dp.png | Bin 115 -> 0 bytes src/main/res/drawable/ic_event_24dp.xml | 6 + src/main/res/drawable/ic_event_black_24dp.png | Bin 127 -> 0 bytes src/main/res/drawable/ic_event_note_24dp.xml | 6 + .../res/drawable/ic_event_note_black_24dp.png | Bin 132 -> 0 bytes src/main/res/drawable/ic_filter_list_24dp.xml | 6 + .../drawable/ic_filter_list_black_24dp.png | Bin 89 -> 0 bytes src/main/res/drawable/ic_flag_24dp.xml | 6 + src/main/res/drawable/ic_flag_black_24dp.png | Bin 99 -> 0 bytes src/main/res/drawable/ic_folder_24dp.xml | 6 + .../res/drawable/ic_folder_black_24dp.png | Bin 118 -> 0 bytes src/main/res/drawable/ic_help_24dp.xml | 6 + src/main/res/drawable/ic_help_black_24dp.png | Bin 298 -> 0 bytes src/main/res/drawable/ic_history_24dp.xml | 6 + .../res/drawable/ic_history_black_24dp.png | Bin 311 -> 0 bytes src/main/res/drawable/ic_inbox_24dp.xml | 6 + src/main/res/drawable/ic_inbox_black_24dp.png | Bin 169 -> 0 bytes .../drawable/ic_insert_drive_file_24dp.xml | 6 + .../ic_insert_drive_file_black_24dp.png | Bin 131 -> 0 bytes src/main/res/drawable/ic_label_24dp.xml | 6 + src/main/res/drawable/ic_label_black_24dp.png | Bin 166 -> 0 bytes .../res/drawable/ic_label_outline_24dp.xml | 9 + .../drawable/ic_label_outline_black_24dp.png | Bin 186 -> 0 bytes src/main/res/drawable/ic_menu_24dp.xml | 6 + src/main/res/drawable/ic_menu_white_24dp.png | Bin 83 -> 0 bytes src/main/res/drawable/ic_mic_24dp.xml | 6 + src/main/res/drawable/ic_mic_white_24dp.png | Bin 245 -> 0 bytes .../res/drawable/ic_notifications_24dp.xml | 6 + .../drawable/ic_notifications_black_24dp.png | Bin 175 -> 0 bytes src/main/res/drawable/ic_phone_black_24dp.png | Bin 244 -> 0 bytes src/main/res/drawable/ic_repeat_24dp.xml | 6 + .../res/drawable/ic_repeat_black_24dp.png | Bin 122 -> 0 bytes src/main/res/drawable/ic_save_24dp.xml | 6 + src/main/res/drawable/ic_save_white_24dp.png | Bin 168 -> 0 bytes src/main/res/drawable/ic_schedule_24dp.xml | 6 + .../res/drawable/ic_schedule_black_24dp.png | Bin 345 -> 0 bytes src/main/res/drawable/ic_search_24dp.xml | 6 + .../res/drawable/ic_search_white_24dp.png | Bin 247 -> 0 bytes src/main/res/drawable/ic_settings_24dp.xml | 6 + .../res/drawable/ic_settings_black_24dp.png | Bin 322 -> 0 bytes .../res/drawable/ic_settings_white_24dp.png | Bin 326 -> 0 bytes src/main/res/drawable/ic_snooze_24dp.xml | 6 + src/main/res/drawable/ic_sort_24dp.xml | 6 + src/main/res/drawable/ic_sort_white_24dp.png | Bin 90 -> 0 bytes src/main/res/drawable/ic_timer_24dp.xml | 6 + src/main/res/drawable/ic_timer_black_24dp.png | Bin 316 -> 0 bytes src/main/res/drawable/ic_today_24dp.xml | 6 + src/main/res/drawable/ic_today_black_24dp.png | Bin 128 -> 0 bytes .../res/drawable/ic_visibility_off_24dp.xml | 6 + .../drawable/ic_visibility_off_black_24dp.png | Bin 351 -> 0 bytes src/main/res/layout/alarm_edit_row.xml | 3 +- .../astrid_calendar_list_creator_view.xml | 6 +- .../layout/astrid_calendar_reminder_view.xml | 6 +- .../res/layout/astrid_record_audio_view.xml | 3 +- src/main/res/layout/control_set_deadline.xml | 3 +- src/main/res/layout/control_set_template.xml | 1 + src/main/res/layout/file_row.xml | 3 +- src/main/res/layout/filter_adapter_row.xml | 1 + src/main/res/layout/tag_edit_row.xml | 3 +- src/main/res/layout/task_edit_activity.xml | 3 +- src/main/res/layout/task_list_activity.xml | 3 +- src/main/res/layout/widget_toolbar.xml | 3 +- src/main/res/menu/tag_settings_activity.xml | 4 +- src/main/res/menu/task_edit_fragment.xml | 6 +- src/main/res/menu/task_list_activity.xml | 6 +- src/main/res/values/attrs.xml | 5 +- src/main/res/values/styles_dark.xml | 5 +- src/main/res/values/styles_light.xml | 6 +- 231 files changed, 490 insertions(+), 114 deletions(-) create mode 100644 src/main/java/org/tasks/ui/MenuColorizer.java delete mode 100644 src/main/res/drawable-hdpi/ic_add_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_arrow_back_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_attachment_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_attachment_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_cancel_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_cancel_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_close_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_close_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_cloud_queue_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_delete_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_event_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_event_note_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_flag_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_folder_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_help_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_history_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_inbox_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_insert_drive_file_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_label_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_menu_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_mic_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_notifications_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_phone_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_repeat_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_save_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_schedule_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_search_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_settings_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_settings_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_sort_white_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_timer_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_today_black_24dp.png delete mode 100644 src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_add_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_arrow_back_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_attachment_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_attachment_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_cancel_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_close_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_close_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_delete_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_event_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_event_note_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_flag_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_folder_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_help_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_history_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_insert_drive_file_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_label_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_label_outline_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_menu_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_mic_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_notifications_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_phone_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_save_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_schedule_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_search_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_settings_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_settings_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_sort_white_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_timer_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_today_black_24dp.png delete mode 100644 src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_add_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_arrow_back_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_attachment_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_attachment_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_close_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_close_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_cloud_queue_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_event_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_event_note_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_flag_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_folder_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_help_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_history_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_insert_drive_file_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_label_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_label_outline_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_menu_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_mic_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_notifications_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_phone_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_save_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_schedule_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_search_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_timer_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_today_black_24dp.png delete mode 100644 src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png create mode 100644 src/main/res/drawable/ic_add_24dp.xml delete mode 100644 src/main/res/drawable/ic_add_black_24dp.png create mode 100644 src/main/res/drawable/ic_arrow_back_24dp.xml delete mode 100644 src/main/res/drawable/ic_arrow_back_black_24dp.png delete mode 100644 src/main/res/drawable/ic_arrow_back_white_24dp.png create mode 100644 src/main/res/drawable/ic_attach_money_24dp.xml delete mode 100644 src/main/res/drawable/ic_attach_money_black_24dp.png create mode 100644 src/main/res/drawable/ic_attachment_24dp.xml delete mode 100644 src/main/res/drawable/ic_attachment_black_24dp.png delete mode 100644 src/main/res/drawable/ic_attachment_white_24dp.png create mode 100644 src/main/res/drawable/ic_cancel_24dp.xml delete mode 100644 src/main/res/drawable/ic_cancel_black_24dp.png delete mode 100644 src/main/res/drawable/ic_cancel_white_24dp.png create mode 100644 src/main/res/drawable/ic_check_24dp.xml create mode 100644 src/main/res/drawable/ic_close_24dp.xml delete mode 100644 src/main/res/drawable/ic_close_black_24dp.png delete mode 100644 src/main/res/drawable/ic_close_white_24dp.png create mode 100644 src/main/res/drawable/ic_cloud_queue_24dp.xml delete mode 100644 src/main/res/drawable/ic_cloud_queue_black_24dp.png create mode 100644 src/main/res/drawable/ic_delete_24dp.xml delete mode 100644 src/main/res/drawable/ic_delete_white_24dp.png create mode 100644 src/main/res/drawable/ic_event_24dp.xml delete mode 100644 src/main/res/drawable/ic_event_black_24dp.png create mode 100644 src/main/res/drawable/ic_event_note_24dp.xml delete mode 100644 src/main/res/drawable/ic_event_note_black_24dp.png create mode 100644 src/main/res/drawable/ic_filter_list_24dp.xml delete mode 100644 src/main/res/drawable/ic_filter_list_black_24dp.png create mode 100644 src/main/res/drawable/ic_flag_24dp.xml delete mode 100644 src/main/res/drawable/ic_flag_black_24dp.png create mode 100644 src/main/res/drawable/ic_folder_24dp.xml delete mode 100644 src/main/res/drawable/ic_folder_black_24dp.png create mode 100644 src/main/res/drawable/ic_help_24dp.xml delete mode 100644 src/main/res/drawable/ic_help_black_24dp.png create mode 100644 src/main/res/drawable/ic_history_24dp.xml delete mode 100644 src/main/res/drawable/ic_history_black_24dp.png create mode 100644 src/main/res/drawable/ic_inbox_24dp.xml delete mode 100644 src/main/res/drawable/ic_inbox_black_24dp.png create mode 100644 src/main/res/drawable/ic_insert_drive_file_24dp.xml delete mode 100644 src/main/res/drawable/ic_insert_drive_file_black_24dp.png create mode 100644 src/main/res/drawable/ic_label_24dp.xml delete mode 100644 src/main/res/drawable/ic_label_black_24dp.png create mode 100644 src/main/res/drawable/ic_label_outline_24dp.xml delete mode 100644 src/main/res/drawable/ic_label_outline_black_24dp.png create mode 100644 src/main/res/drawable/ic_menu_24dp.xml delete mode 100644 src/main/res/drawable/ic_menu_white_24dp.png create mode 100644 src/main/res/drawable/ic_mic_24dp.xml delete mode 100644 src/main/res/drawable/ic_mic_white_24dp.png create mode 100644 src/main/res/drawable/ic_notifications_24dp.xml delete mode 100644 src/main/res/drawable/ic_notifications_black_24dp.png delete mode 100644 src/main/res/drawable/ic_phone_black_24dp.png create mode 100644 src/main/res/drawable/ic_repeat_24dp.xml delete mode 100644 src/main/res/drawable/ic_repeat_black_24dp.png create mode 100644 src/main/res/drawable/ic_save_24dp.xml delete mode 100644 src/main/res/drawable/ic_save_white_24dp.png create mode 100644 src/main/res/drawable/ic_schedule_24dp.xml delete mode 100644 src/main/res/drawable/ic_schedule_black_24dp.png create mode 100644 src/main/res/drawable/ic_search_24dp.xml delete mode 100644 src/main/res/drawable/ic_search_white_24dp.png create mode 100644 src/main/res/drawable/ic_settings_24dp.xml delete mode 100644 src/main/res/drawable/ic_settings_black_24dp.png delete mode 100644 src/main/res/drawable/ic_settings_white_24dp.png create mode 100644 src/main/res/drawable/ic_snooze_24dp.xml create mode 100644 src/main/res/drawable/ic_sort_24dp.xml delete mode 100644 src/main/res/drawable/ic_sort_white_24dp.png create mode 100644 src/main/res/drawable/ic_timer_24dp.xml delete mode 100644 src/main/res/drawable/ic_timer_black_24dp.png create mode 100644 src/main/res/drawable/ic_today_24dp.xml delete mode 100644 src/main/res/drawable/ic_today_black_24dp.png create mode 100644 src/main/res/drawable/ic_visibility_off_24dp.xml delete mode 100644 src/main/res/drawable/ic_visibility_off_black_24dp.png diff --git a/.travis.yml b/.travis.yml index bed6a3046..f89d7f215 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,10 +3,10 @@ sudo: false jdk: oraclejdk7 env: matrix: - - ANDROID_SDKS=android-23,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a + - ANDROID_SDKS=android-22,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a android: components: - - android-23 + - android-22 - platform-tools-23.0.1 - build-tools-23.0.1 - extra-android-m2repository diff --git a/build.gradle b/build.gradle index 64a710f2b..c33e532f2 100644 --- a/build.gradle +++ b/build.gradle @@ -7,10 +7,11 @@ task wrapper(type: Wrapper) { buildscript { repositories { mavenCentral() + jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + classpath 'com.android.tools.build:gradle:1.4.0-beta5' } } @@ -23,7 +24,7 @@ android { lintConfig file("lint.xml") } - compileSdkVersion 23 + compileSdkVersion 22 buildToolsVersion "23.0.1" defaultConfig { diff --git a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java index d68a7d88f..cd2073f04 100644 --- a/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java +++ b/src/main/java/com/todoroo/astrid/actfm/FilterSettingsActivity.java @@ -8,7 +8,9 @@ package com.todoroo.astrid.actfm; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; import android.view.Menu; @@ -25,6 +27,7 @@ import org.tasks.R; import org.tasks.dialogs.DialogBuilder; import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.preferences.ActivityPreferences; +import org.tasks.ui.MenuColorizer; import javax.inject.Inject; @@ -59,7 +62,9 @@ public class FilterSettingsActivity extends InjectingAppCompatActivity { ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar != null) { supportActionBar.setDisplayHomeAsUpEnabled(true); - supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); + Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp)); + DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + supportActionBar.setHomeAsUpIndicator(drawable); supportActionBar.setTitle(filter.listingTitle); } @@ -95,6 +100,7 @@ public class FilterSettingsActivity extends InjectingAppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.tag_settings_activity, menu); + MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); return super.onCreateOptionsMenu(menu); } diff --git a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java index b590c144a..e2df1cd46 100644 --- a/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/src/main/java/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -8,7 +8,9 @@ package com.todoroo.astrid.actfm; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; import android.view.Menu; @@ -31,6 +33,7 @@ import org.tasks.R; import org.tasks.dialogs.DialogBuilder; import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.preferences.ActivityPreferences; +import org.tasks.ui.MenuColorizer; import javax.inject.Inject; @@ -74,7 +77,9 @@ public class TagSettingsActivity extends InjectingAppCompatActivity { ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar != null) { supportActionBar.setDisplayHomeAsUpEnabled(true); - supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); + Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp)); + DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + supportActionBar.setHomeAsUpIndicator(drawable); supportActionBar.setTitle(isNewTag ? getString(R.string.new_tag) : tagData.getName()); } @@ -133,6 +138,7 @@ public class TagSettingsActivity extends InjectingAppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.tag_settings_activity, menu); + MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); if (isNewTag) { menu.findItem(R.id.delete).setVisible(false); } diff --git a/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java b/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java index cbaf727b7..d05097f60 100644 --- a/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/FilterShortcutActivity.java @@ -47,7 +47,7 @@ public class FilterShortcutActivity extends InjectingListActivity { setContentView(R.layout.filter_shortcut_activity); // set up ui - adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false, preferences); + adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false); setListAdapter(adapter); Button button = (Button)findViewById(R.id.ok); diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java index e693768ba..0688d5eae 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditActivity.java @@ -5,8 +5,10 @@ */ package com.todoroo.astrid.activity; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; import android.view.KeyEvent; @@ -18,10 +20,15 @@ import org.tasks.preferences.ActivityPreferences; import javax.inject.Inject; +import butterknife.ButterKnife; +import butterknife.InjectView; + public class TaskEditActivity extends AstridActivity { @Inject ActivityPreferences preferences; + @InjectView(R.id.toolbar) Toolbar toolbar; + /** * @see android.app.Activity#onCreate(Bundle) */ @@ -31,15 +38,16 @@ public class TaskEditActivity extends AstridActivity { preferences.applyThemeAndStatusBarColor(); setContentView(R.layout.task_edit_wrapper_activity); + ButterKnife.inject(this); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - if (toolbar != null) { - setSupportActionBar(toolbar); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setDisplayShowTitleEnabled(false); - toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp); + setSupportActionBar(toolbar); + ActionBar supportActionBar = getSupportActionBar(); + if (supportActionBar != null) { + supportActionBar.setDisplayHomeAsUpEnabled(true); + supportActionBar.setDisplayShowTitleEnabled(false); + Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_arrow_back_24dp)); + DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + supportActionBar.setHomeAsUpIndicator(drawable); } } diff --git a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 84b1980d6..7b68afb11 100755 --- a/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -10,11 +10,9 @@ 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; @@ -87,6 +85,7 @@ import org.tasks.notifications.NotificationManager; import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.DeviceInfo; import org.tasks.ui.DeadlineControlSet; +import org.tasks.ui.MenuColorizer; import java.io.File; import java.util.ArrayList; @@ -446,11 +445,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { if (controlSet != null) { ImageView icon = (ImageView) controlSet.findViewById(R.id.icon); if (icon != null) { - Drawable drawable = getResources().getDrawable(curr.getIcon()); - if (preferences.isDarkTheme()) { - drawable = whiteTint(drawable); - } - icon.setImageDrawable(drawable); + icon.setImageResource(curr.getIcon()); } basicControls.addView(controlSet); } @@ -464,12 +459,6 @@ 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 * @@ -877,6 +866,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { menu.clear(); inflater.inflate(R.menu.task_edit_fragment, menu); + MenuColorizer.colorMenu(getActivity(), menu, getResources().getColor(android.R.color.white)); if (preGingerbreadMR1()) { // media recorder aac support requires api level 10 // approximately 1% of current installs are using api level 7-9 diff --git a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 4452ad0c8..8fa5277b7 100644 --- a/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -8,9 +8,11 @@ package com.todoroo.astrid.activity; import android.app.Activity; import android.content.Intent; import android.content.IntentFilter; +import android.graphics.drawable.Drawable; import android.os.Bundle; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v4.view.MenuItemCompat; import android.support.v4.view.ViewPager.OnPageChangeListener; import android.support.v4.widget.DrawerLayout; @@ -53,6 +55,7 @@ import org.tasks.R; import org.tasks.activities.SortActivity; import org.tasks.preferences.ActivityPreferences; import org.tasks.receivers.RepeatConfirmationReceiver; +import org.tasks.ui.MenuColorizer; import org.tasks.ui.NavigationDrawerFragment; import javax.inject.Inject; @@ -99,7 +102,9 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar != null) { supportActionBar.setDisplayHomeAsUpEnabled(true); - toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp); + Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_menu_24dp)); + DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + toolbar.setNavigationIcon(drawable); } toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override @@ -182,6 +187,7 @@ public class TaskListActivity extends AstridActivity implements OnPageChangeList @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.task_list_activity, menu); + MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); TaskListFragment tlf = getTaskListFragment(); MenuItem hidden = menu.findItem(R.id.menu_show_hidden); if (preferences.getBoolean(R.string.p_show_hidden_tasks, false)) { diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index 641b9c2b9..befe32ae4 100644 --- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -10,8 +10,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.graphics.drawable.Drawable; -import android.support.v4.graphics.drawable.DrawableCompat; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -35,7 +33,6 @@ import org.tasks.filters.FilterProvider; import org.tasks.filters.NavigationDrawerAction; import org.tasks.filters.NavigationDrawerSeparator; import org.tasks.filters.NavigationDrawerSubheader; -import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.BasicPreferences; import org.tasks.preferences.HelpAndFeedbackActivity; import org.tasks.ui.NavigationDrawerFragment; @@ -57,21 +54,19 @@ public class FilterAdapter extends ArrayAdapter { private final Activity activity; private final ListView listView; private boolean navigationDrawer; - private ActivityPreferences activityPreferences; private final FilterListUpdateReceiver filterListUpdateReceiver = new FilterListUpdateReceiver(); /** layout inflater */ private final LayoutInflater inflater; public FilterAdapter(FilterProvider filterProvider, FilterCounter filterCounter, Activity activity, - ListView listView, boolean navigationDrawer, ActivityPreferences activityPreferences) { + ListView listView, boolean navigationDrawer) { super(activity, 0); this.filterProvider = filterProvider; this.filterCounter = filterCounter; this.activity = activity; this.listView = listView; this.navigationDrawer = navigationDrawer; - this.activityPreferences = activityPreferences; inflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE); } @@ -261,13 +256,13 @@ public class FilterAdapter extends ArrayAdapter { add(new NavigationDrawerAction( activity.getResources().getString(R.string.new_tag), - R.drawable.ic_add_black_24dp, + R.drawable.ic_add_24dp, new Intent(activity, TagSettingsActivity.class), NavigationDrawerFragment.REQUEST_NEW_LIST)); add(new NavigationDrawerAction( activity.getResources().getString(R.string.FLA_new_filter), - R.drawable.ic_add_black_24dp, + R.drawable.ic_add_24dp, new Intent(activity, CustomFilterActivity.class), TaskListFragment.ACTIVITY_REQUEST_NEW_FILTER)); @@ -275,17 +270,17 @@ public class FilterAdapter extends ArrayAdapter { add(new NavigationDrawerAction( activity.getResources().getString(R.string.TLA_menu_settings), - R.drawable.ic_settings_black_24dp, + R.drawable.ic_settings_24dp, new Intent(activity, BasicPreferences.class), REQUEST_SETTINGS)); add(new NavigationDrawerAction( activity.getResources().getString(R.string.help_and_feedback), - R.drawable.ic_help_black_24dp, + R.drawable.ic_help_24dp, new Intent(activity, HelpAndFeedbackActivity.class), 0)); add(new NavigationDrawerAction( activity.getResources().getString(R.string.TLA_menu_donate), - R.drawable.ic_attach_money_black_24dp, + R.drawable.ic_attach_money_24dp, new Intent(activity, DonationActivity.class), 0)); } @@ -330,18 +325,8 @@ public class FilterAdapter extends ArrayAdapter { viewHolder.view.setBackgroundResource(0); int icon = filter.icon; - if (icon == 0) { - viewHolder.icon.setVisibility(View.INVISIBLE); - } else { - Drawable drawable = activity.getResources().getDrawable(icon, activity.getTheme()); - if (activityPreferences.isDarkTheme()) { - Drawable wrapDrawable = DrawableCompat.wrap(drawable); - DrawableCompat.setTint(wrapDrawable, activity.getResources().getColor(android.R.color.white)); - drawable = wrapDrawable; - } - viewHolder.icon.setImageDrawable(drawable); - viewHolder.icon.setVisibility(View.VISIBLE); - } + viewHolder.icon.setImageResource(icon); + viewHolder.icon.setVisibility(icon == 0 ? View.INVISIBLE : View.VISIBLE); String title = filter.listingTitle; if(!title.equals(viewHolder.name.getText())) { diff --git a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java b/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java index 3cd0bea8d..a073339c1 100644 --- a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java @@ -51,7 +51,7 @@ public final class BuiltInFilterExposer { public Filter getMyTasksFilter() { Filter myTasksFilter = getMyTasksFilter(context.getResources()); - myTasksFilter.icon = R.drawable.ic_inbox_black_24dp; + myTasksFilter.icon = R.drawable.ic_inbox_24dp; return myTasksFilter; } @@ -62,17 +62,17 @@ public final class BuiltInFilterExposer { if (preferences.getBoolean(R.string.p_show_today_filter, true)) { Filter todayFilter = getTodayFilter(r); - todayFilter.icon = R.drawable.ic_today_black_24dp; + todayFilter.icon = R.drawable.ic_today_24dp; filters.add(todayFilter); } if (preferences.getBoolean(R.string.p_show_recently_modified_filter, true)) { Filter recentlyModifiedFilter = getRecentlyModifiedFilter(r); - recentlyModifiedFilter.icon = R.drawable.ic_history_black_24dp; + recentlyModifiedFilter.icon = R.drawable.ic_history_24dp; filters.add(recentlyModifiedFilter); } if (preferences.getBoolean(R.string.p_show_not_in_list_filter, true)) { Filter uncategorizedFilter = getUncategorizedFilter(r); - uncategorizedFilter.icon = R.drawable.ic_label_outline_black_24dp; + uncategorizedFilter.icon = R.drawable.ic_label_outline_24dp; filters.add(uncategorizedFilter); } // transmit filter list diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index 4dec55faf..687a8a0a4 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -10,7 +10,9 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.database.Cursor; +import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.app.ActionBar; import android.support.v7.widget.Toolbar; import android.view.ContextMenu; @@ -45,6 +47,7 @@ import org.tasks.dialogs.DialogBuilder; import org.tasks.filters.FilterCriteriaProvider; import org.tasks.injection.InjectingAppCompatActivity; import org.tasks.preferences.ActivityPreferences; +import org.tasks.ui.MenuColorizer; import java.util.ArrayList; import java.util.List; @@ -156,7 +159,9 @@ public class CustomFilterActivity extends InjectingAppCompatActivity { ActionBar supportActionBar = getSupportActionBar(); if (supportActionBar != null) { supportActionBar.setDisplayHomeAsUpEnabled(true); - supportActionBar.setHomeAsUpIndicator(R.drawable.ic_close_white_24dp); + Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_close_24dp)); + DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + supportActionBar.setHomeAsUpIndicator(drawable); supportActionBar.setTitle(R.string.FLA_new_filter); } @@ -348,6 +353,7 @@ public class CustomFilterActivity extends InjectingAppCompatActivity { @Override public boolean onCreateOptionsMenu(Menu menu) { getMenuInflater().inflate(R.menu.tag_settings_activity, menu); + MenuColorizer.colorMenu(this, menu, getResources().getColor(android.R.color.white)); menu.findItem(R.id.delete).setVisible(false); return super.onCreateOptionsMenu(menu); } diff --git a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index 7fbc3438d..954668c27 100644 --- a/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -30,7 +30,7 @@ public final class CustomFilterExposer { public List getFilters() { final List list = new ArrayList<>(); - final int filter = R.drawable.ic_filter_list_black_24dp; + final int filter = R.drawable.ic_filter_list_24dp; storeObjectDao.getSavedFilters(new Callback() { @Override diff --git a/src/main/java/com/todoroo/astrid/files/FileExplore.java b/src/main/java/com/todoroo/astrid/files/FileExplore.java index 498276348..8b7a5e4bc 100644 --- a/src/main/java/com/todoroo/astrid/files/FileExplore.java +++ b/src/main/java/com/todoroo/astrid/files/FileExplore.java @@ -107,21 +107,21 @@ public class FileExplore extends InjectingAppCompatActivity { String[] fList = path.list(filter); fileList = new Item[fList.length]; for (int i = 0; i < fList.length; i++) { - fileList[i] = new Item(fList[i], R.drawable.ic_insert_drive_file_black_24dp); + fileList[i] = new Item(fList[i], R.drawable.ic_insert_drive_file_24dp); // Convert into file path File sel = new File(path, fList[i]); // Set drawables if (sel.isDirectory()) { - fileList[i].icon = R.drawable.ic_folder_black_24dp; + fileList[i].icon = R.drawable.ic_folder_24dp; } } if (!firstLvl) { Item temp[] = new Item[fileList.length + 1]; System.arraycopy(fileList, 0, temp, 1, fileList.length); - temp[0] = new Item(upString, R.drawable.ic_arrow_back_black_24dp); + temp[0] = new Item(upString, R.drawable.ic_arrow_back_24dp); fileList = temp; } } else { @@ -140,7 +140,7 @@ public class FileExplore extends InjectingAppCompatActivity { // put the image on the text view int icon = fileList[position].icon; - Drawable drawable = getResources().getDrawable(icon, getTheme()); + Drawable drawable = getResources().getDrawable(icon); if (activityPreferences.isDarkTheme()) { Drawable wrapDrawable = DrawableCompat.wrap(drawable); DrawableCompat.setTint(wrapDrawable, getResources().getColor(android.R.color.white)); diff --git a/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/src/main/java/com/todoroo/astrid/files/FilesControlSet.java index 982c8b870..5cf70d425 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.drawable.ic_attachment_black_24dp; + return R.drawable.ic_attachment_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 c528f4fc0..3c781ca74 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.drawable.ic_event_black_24dp; + return R.drawable.ic_event_24dp; } } diff --git a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java index 0102bdfb3..3ae0dff96 100644 --- a/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/gtasks/GtasksFilterExposer.java @@ -62,7 +62,7 @@ public class GtasksFilterExposer { return emptyList(); } - int cloud = R.drawable.ic_cloud_queue_black_24dp; + int cloud = R.drawable.ic_cloud_queue_24dp; List listFilters = newArrayList(); for (GtasksList list : gtasksListService.getLists()) { diff --git a/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index 64cd26784..68f37a564 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.drawable.ic_repeat_black_24dp; + return R.drawable.ic_repeat_24dp; } @Override diff --git a/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java index c6327ea97..f1a66a0c8 100644 --- a/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java @@ -89,7 +89,7 @@ public class TagFilterExposer { List filters = new ArrayList<>(); - int label = R.drawable.ic_label_black_24dp; + int label = R.drawable.ic_label_24dp; for (TagData tag : tags) { Filter f = constructFilter(context, tag); diff --git a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java index 15012cf25..e55a28a92 100644 --- a/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java +++ b/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java @@ -5,16 +5,13 @@ */ package com.todoroo.astrid.tags; -import android.app.Activity; import android.support.v4.app.FragmentActivity; -import android.support.v7.app.AlertDialog; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; import android.view.KeyEvent; import android.view.LayoutInflater; import android.view.View; -import android.view.WindowManager; import android.view.inputmethod.EditorInfo; import android.widget.ArrayAdapter; import android.widget.AutoCompleteTextView; @@ -252,7 +249,7 @@ public final class TagsControlSet extends PopupControlSet { @Override public int getIcon() { - return R.drawable.ic_label_black_24dp; + return R.drawable.ic_label_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 89f3c1157..9a304abb3 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.drawable.ic_timer_black_24dp; + return R.drawable.ic_timer_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 857164171..7fdfd3f39 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.drawable.ic_event_note_black_24dp; + return R.drawable.ic_event_note_24dp; } } diff --git a/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index 9c79adf28..c9002b619 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.drawable.ic_visibility_off_black_24dp; + return R.drawable.ic_visibility_off_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 9d4474346..d93424248 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.drawable.ic_flag_black_24dp; + return R.drawable.ic_flag_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 4313c5d78..339136065 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.drawable.ic_notifications_black_24dp; + return R.drawable.ic_notifications_24dp; } } diff --git a/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java b/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java index d1bdad691..d86036b73 100644 --- a/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java +++ b/src/main/java/com/todoroo/astrid/widget/WidgetConfigActivity.java @@ -95,7 +95,7 @@ public class WidgetConfigActivity extends InjectingListActivity { } // set up ui - adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false, preferences); + adapter = new FilterAdapter(filterProvider, filterCounter, this, getListView(), false); setListAdapter(adapter); Button button = (Button) findViewById(R.id.ok); diff --git a/src/main/java/org/tasks/Notifier.java b/src/main/java/org/tasks/Notifier.java index cf46d778f..ed5bc05ae 100644 --- a/src/main/java/org/tasks/Notifier.java +++ b/src/main/java/org/tasks/Notifier.java @@ -11,7 +11,6 @@ import android.graphics.Color; import android.net.Uri; import android.provider.ContactsContract; import android.support.v4.app.NotificationCompat; -import android.support.v4.media.MediaDescriptionCompatApi21; import android.text.TextUtils; import com.todoroo.andlib.data.TodorooCursor; diff --git a/src/main/java/org/tasks/activities/FilterSelectionActivity.java b/src/main/java/org/tasks/activities/FilterSelectionActivity.java index 885a74799..baa710a84 100644 --- a/src/main/java/org/tasks/activities/FilterSelectionActivity.java +++ b/src/main/java/org/tasks/activities/FilterSelectionActivity.java @@ -33,7 +33,7 @@ public class FilterSelectionActivity extends InjectingAppCompatActivity { activityPreferences.applyTheme(); - final FilterAdapter filterAdapter = new FilterAdapter(filterProvider, filterCounter, this, null, false, activityPreferences); + final FilterAdapter filterAdapter = new FilterAdapter(filterProvider, filterCounter, this, null, false); filterAdapter.populateList(); dialogBuilder.newDialog() diff --git a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java index e02bd0c92..c38c61a6f 100644 --- a/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java +++ b/src/main/java/org/tasks/injection/InjectingPreferenceActivity.java @@ -1,6 +1,8 @@ package org.tasks.injection; +import android.graphics.drawable.Drawable; import android.os.Bundle; +import android.support.v4.graphics.drawable.DrawableCompat; import android.support.v7.widget.Toolbar; import android.view.View; import android.view.ViewGroup; @@ -42,7 +44,9 @@ public abstract class InjectingPreferenceActivity extends AppCompatPreferenceAct toolbar = (Toolbar) toolbarContainer.findViewById(R.id.toolbar); toolbar.setTitle(getTitle()); - toolbar.setNavigationIcon(R.drawable.ic_arrow_back_white_24dp); + Drawable drawable = DrawableCompat.wrap(getResources().getDrawable(R.drawable.ic_arrow_back_24dp)); + DrawableCompat.setTint(drawable, getResources().getColor(android.R.color.white)); + toolbar.setNavigationIcon(drawable); toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/src/main/java/org/tasks/preferences/ResourceResolver.java b/src/main/java/org/tasks/preferences/ResourceResolver.java index 6d99e3adc..2f05bcc2c 100644 --- a/src/main/java/org/tasks/preferences/ResourceResolver.java +++ b/src/main/java/org/tasks/preferences/ResourceResolver.java @@ -7,6 +7,7 @@ import javax.inject.Inject; import javax.inject.Singleton; @Singleton +@Deprecated public class ResourceResolver { private final Activity activity; diff --git a/src/main/java/org/tasks/ui/DeadlineControlSet.java b/src/main/java/org/tasks/ui/DeadlineControlSet.java index 3d7ce8988..0ff23022b 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.drawable.ic_schedule_black_24dp; + return R.drawable.ic_schedule_24dp; } } diff --git a/src/main/java/org/tasks/ui/MenuColorizer.java b/src/main/java/org/tasks/ui/MenuColorizer.java new file mode 100644 index 000000000..a75bd61a8 --- /dev/null +++ b/src/main/java/org/tasks/ui/MenuColorizer.java @@ -0,0 +1,156 @@ +/* + * Copyright (C) 2014 Jared Rummler + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.tasks.ui; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.graphics.PorterDuff; +import android.graphics.drawable.Drawable; +import android.os.Build; +import android.view.Menu; +import android.view.MenuItem; +import android.view.SubMenu; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageButton; + +/** + * Helper class to set the color and transparency for menu icons in an ActionBar/Toolbar.

+ * + * Example usage: + * + *
+ * 
+ * public boolean onCreateOptionsMenu(Menu menu) {
+ *     ...
+ *     int color = getResources().getColor(R.color.your_awesome_color);
+ *     int alpha = 204; // 80% alpha
+ *     MenuColorizer.colorMenu(this, menu, color, alpha);
+ *     ...
+ * }
+ * 
+ * 
+ * + * @author Jared Rummler + * @since Dec 11, 2014 + */ +public class MenuColorizer { + + private MenuColorizer() { + } + + /** Sets a color filter on all menu icons, including the overflow button (if it exists) */ + public static void colorMenu(final Activity activity, final Menu menu, final int color) { + colorMenu(activity, menu, color, 0); + } + + /** Sets a color filter on all menu icons, including the overflow button (if it exists) */ + public static void colorMenu(final Activity activity, final Menu menu, final int color, + final int alpha) { + for (int i = 0, size = menu.size(); i < size; i++) { + final MenuItem menuItem = menu.getItem(i); + colorMenuItem(menuItem, color, alpha); + if (menuItem.hasSubMenu()) { + final SubMenu subMenu = menuItem.getSubMenu(); + for (int j = 0; j < subMenu.size(); j++) { + colorMenuItem(subMenu.getItem(j), color, alpha); + } + } + } + final View home = activity.findViewById(android.R.id.home); + if (home != null) { + home.post(new Runnable() { + + @Override + public void run() { + colorOverflow(activity, color, alpha); + } + }); + } + } + + /** Sets a color filter on a {@link MenuItem} */ + public static void colorMenuItem(final MenuItem menuItem, final int color) { + colorMenuItem(menuItem, color, 0); + } + + /** Sets a color filter on a {@link MenuItem} */ + public static void colorMenuItem(final MenuItem menuItem, final int color, final int alpha) { + final Drawable drawable = menuItem.getIcon(); + if (drawable != null) { + // If we don't mutate the drawable, then all drawable's with this id will have a color + // filter applied to it. + drawable.mutate(); + drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP); + if (alpha > 0) { + drawable.setAlpha(alpha); + } + } + } + + /** Sets a color filter on the OverflowMenuButton in an ActionBar or Toolbar */ + public static void colorOverflow(final Activity activity, final int color) { + colorOverflow(activity, color, 0); + } + + /** Sets a color filter on the OverflowMenuButton in an ActionBar or Toolbar */ + @SuppressLint("NewApi") + @SuppressWarnings("deprecation") + public static void colorOverflow(final Activity activity, final int color, final int alpha) { + final ImageButton overflow = getOverflowMenu(activity); + if (overflow != null) { + overflow.setColorFilter(color); + if (alpha > 0) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { + overflow.setImageAlpha(alpha); + } else { + overflow.setAlpha(alpha); + } + } + } + } + + /* Find that OverflowMenuButton */ + private static ImageButton getOverflowMenu(final Activity activity, + final ViewGroup... viewGroup) { + final ViewGroup group; + if (viewGroup == null || viewGroup.length == 0) { + final int resId = activity.getResources().getIdentifier("action_bar", "id", "android"); + if (resId != 0) { + group = (ViewGroup) activity.findViewById(resId); + } else { + group = (ViewGroup) activity.findViewById(android.R.id.content).getRootView(); + } + } else { + group = viewGroup[0]; + } + ImageButton overflow = null; + for (int i = 0, l = group.getChildCount(); i < l; i++) { + final View v = group.getChildAt(i); + if (v instanceof ImageButton + && v.getClass().getSimpleName().equals("OverflowMenuButton")) { + overflow = (ImageButton) v; + } else if (v instanceof ViewGroup) { + overflow = getOverflowMenu(activity, (ViewGroup) v); + } + if (overflow != null) { + break; + } + } + return overflow; + } + +} diff --git a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java index 080c680a7..98bc40da0 100644 --- a/src/main/java/org/tasks/ui/NavigationDrawerFragment.java +++ b/src/main/java/org/tasks/ui/NavigationDrawerFragment.java @@ -33,8 +33,8 @@ import org.tasks.filters.FilterProvider; import org.tasks.filters.NavigationDrawerAction; import org.tasks.injection.InjectingFragment; import org.tasks.location.GeofenceService; -import org.tasks.preferences.ActivityPreferences; import org.tasks.preferences.AppearancePreferences; +import org.tasks.preferences.Preferences; import javax.inject.Inject; @@ -68,7 +68,7 @@ public class NavigationDrawerFragment extends InjectingFragment { @Inject FilterCounter filterCounter; @Inject FilterProvider filterProvider; @Inject GeofenceService geofenceService; - @Inject ActivityPreferences preferences; + @Inject Preferences preferences; @Override public void onCreate(Bundle savedInstanceState) { @@ -151,7 +151,7 @@ public class NavigationDrawerFragment extends InjectingFragment { } private void setUpList() { - adapter = new FilterAdapter(filterProvider, filterCounter, getActivity(), mDrawerListView, true, preferences); + adapter = new FilterAdapter(filterProvider, filterCounter, getActivity(), mDrawerListView, true); mDrawerListView.setAdapter(adapter); registerForContextMenu(mDrawerListView); } diff --git a/src/main/res/drawable-hdpi/ic_add_black_24dp.png b/src/main/res/drawable-hdpi/ic_add_black_24dp.png deleted file mode 100644 index c04b523c482b77824608a836515e865579f8b00c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 124 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;v!{z=NCji^0d}{88U+a%3{LE) zc(W3I@VD?TX6u!5iTdQ+%zl7P_JBaSLWcds4UNy(0^e=DSmGkkBjwV6s9vOpiQ(Iw WlC8ByowtC-F?hQAxvX|k0wldT1B8K8l&6bhNCo5D3%fZR5_nu6GTXnn z)U>ihPJZ*vEHjU;Xpa-Nf7v`z+Pb!Kg%oSBYR+9u6~ vKeotrpR%h~+rO+U*x6Z^BW=wWuXoIeu2U7w-_4f;+QQ)J>gTe~DWM4f-d!_! diff --git a/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-hdpi/ic_arrow_back_white_24dp.png deleted file mode 100644 index a2051cef9e8fac97f1259be5c8091d6ab8e2a9d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8yr+v}h{y5d1PRu|LVxmq+;@;o zc39A8b?ndo{U7a(OM4O*w;9f6n`$__eX(KmisUof|K~0c>6I5UYx8iZZVuRU&9CwL y1*X|^qa;hOtXP;Y0@Si8$5LVJ)cteC!TM|TzAVE+xwUl5#Jzi4Oz(%HlOyk|dbrLMC5yqn4AUOBuW9v=PWC zIf{<5d*TEXW{P9VcGV}n)S-)2zNPA%It@~isu(JLq^-np+moURRF>rRE!@`RNfwn6 zdHtPEoOb0&3YAt0vT*A7{U`XbrZsv{%3w;KSZ0_c(`-|b**;ow4evY<#g`f0JZg@J p;#&uEoY)mttkaKP^S{3V`~v_2;vAONoI(Hq002ovPDHLkV1nx|soVen diff --git a/src/main/res/drawable-hdpi/ic_attachment_black_24dp.png b/src/main/res/drawable-hdpi/ic_attachment_black_24dp.png deleted file mode 100644 index e56ddb5a51786107a86180cb470937eced1bd61f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmV+?0oeYDP)yBw-%l}<(P;eVhUPX-LVia-z0(1puy7U^wsQ{@z6-UfkrMejURw)09asokeV4hh z7Tz*+R_jX!miFQ=C2xcu%!R3B;J3&qDTM`pEIU={!K1TU57PPl5g8q;|Z}J^!NwfqiO&E002ovPDHLkV1kUUbzJ}e diff --git a/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png b/src/main/res/drawable-hdpi/ic_attachment_white_24dp.png deleted file mode 100644 index f5a7cd21947cbe1908a1c893ac256b644e9dbe2f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmV+`0o4A9P)vW6bU5ReW%Z z&oQ)8+f89$;=v12IK)j{;3S2Cdkv&eVG&d8r!c{#UK&$j5ld7lJfN2r9N{{a*hrzq zRvObY!ziX0rtlr#Y^MR0BQwlw#yP&EFmSJ(nSK&`R%-ne1}1)MV&U4zW}Z01Tt9DR x!w=NH`lOS$&~av^l|08sr+#_VP}bJog+Kaj9qh~u!O8#t002ovPDHLkV1o60fuaBa diff --git a/src/main/res/drawable-hdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_black_24dp.png deleted file mode 100644 index 50dbfef9339c6a3701825cc53ad1689ce09c7db5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 397 zcmV;80doF{P)g6K^oQ4gStOx?8jW0;tMcIA7! zATP=1H_AN{kuYOR&iP`_hA9aVUNjkV#9(`1L`+2<*<)~zjg#Am%@EEQcS8QjBW>dsJH?N#^I*PpmE)?Sq^WW+&_$aO~IH95FBAqpe8&(d*d zYrM*}0TwZt_s__V1~#M^Pun<{du3)gsq;}e^F|%YQj1ENsUst#WTlZEZ7LEobo|@q r3~1m*NQ((;GENsW)=X#-a({dSZUbA_Y}NV500000NkvXXu0mjf?tG(j diff --git a/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png deleted file mode 100644 index 73f5116bd71f648e5919314c8729f92a192fe944..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 414 zcmV;P0b%}$P)mO^Y5mm^Nsmp0_~#o zKRbmV$v6+qKa7x=IXhA=Tu9k6BPPUTkL-_|OgNF%kugzG=#B$HC7a9K{XGm z@kY^JsOr#)GA%Xep0ahapr$v)Yb<`2cW>IGYiNSo0|5h%vUCY}#BJn5At&)P0R}@K zD;R?zV9j?2>Jo}^v-B~7`eKa#oU|k~2aoD~e$&J13^0|@4pgeEGr&edDKhywIs=J> zE}&C71Dt;e`mtBr>I?%0-eS-vo0-mFopsf__4CI%}gy>h7M(GYe(&ZGR-j>ROOYTJ^P2hPc13ZOudf8TqWeS zr(N{Qju|k0wldT1B8LpG*1`DkP61PSG>8J9RwIIzPh7b zJflYMsk(bE^P@Beu4=(eGmA7oyR_x~a$D?{a5p37g|Cs|p&E~Q4@@WZu3cW0RzKfl zOG4W1`7gJ diff --git a/src/main/res/drawable-hdpi/ic_close_white_24dp.png b/src/main/res/drawable-hdpi/ic_close_white_24dp.png deleted file mode 100644 index ceb1a1eebf2b2cc9a008f42010e144f4dab968de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 221 zcmV<303!d1P)og+*{ z>6z1@lfD*AYSPav7?*5PoRT!uG_K?U|Ao*u3q-Khy4S4s6!ChwTncU zPoRHLDU>0lR2qc_U%m(b@YA1jD}2pmbmsGQW}KntgYod09j++zLY6(g;Gt`7zEh^w z)GEXoq6<@;QnP611hMH8cN$8wL4ZN}@UzaLetXXhHjI#y=|$FP7Nsa-S%&H8zf3JK zZL#TsjQ_)ug9v{(*5xl_Wl6@XRwp${E@JtMDKlH>SQxeixpl(~qe!$=|}6bY?N-lKdS97x<_l=ZtwvrK+3R8M#?l;|k0wldT1B8K8hNp{Th{y5d1PNA=hW|4Ewf~tb z9PIip^F(s-FKmRW+J}dc&f#K)gg?ihMxz_^iWbkzL Kb6Mw<&;$SheLUU( diff --git a/src/main/res/drawable-hdpi/ic_event_black_24dp.png b/src/main/res/drawable-hdpi/ic_event_black_24dp.png deleted file mode 100644 index 0a71678107167443bf2a8a0fcea331dfee0aaecb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 140 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8u&0Y-NCo5DDH}PD2Jjr&^5FTz zzv3PDg{G^8-mz%o=bIBE6*BWN^NVeD|HEG>T<|vUc3IHo=;SLqOJLQb3tuM4Sv|S% p=ls0g6QoUTJaraL{F!(vX7gRCezU~ohCt&PJYD@<);T3K0RRIkGkgF5 diff --git a/src/main/res/drawable-hdpi/ic_event_note_black_24dp.png b/src/main/res/drawable-hdpi/ic_event_note_black_24dp.png deleted file mode 100644 index 3d068f17015f9e17a884763c9bfea98073778967..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 143 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8n5T9naYaFi(Uw=~&Dp@_Hm^0kQZ5!7+R0XLXCWif+oYJpN>;_uEz~JfX=d#Wzp$PyR7cNTx diff --git a/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-hdpi/ic_filter_list_black_24dp.png deleted file mode 100644 index a966cb9bd03131170190bceb9057938491e08f7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 107 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;k*AAeNCo5DGm3l+3L=Lu)PK2K z6(dWz6@&-RC`6Y)gifU*)TCiW4)t2FXm;2ua);ke1YA>Asd=;ph!PC{xWt~$( F69B-SBB1~P diff --git a/src/main/res/drawable-hdpi/ic_flag_black_24dp.png b/src/main/res/drawable-hdpi/ic_flag_black_24dp.png deleted file mode 100644 index 9e1e88a8459e03fb751f996f9d859d4c960285b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;r>Bc!NCjiE1Y3fLiNT-aoT@8R zCzx;LS*3hg;m`!9W;b3b(~K(%*h~V;+Ty23wlF+jk$ORgi${s4ZMNfLHcJNHOomA& c42u~U9JNY+)z68I0vgKT>FVdQ&MBb@0KM=d4gdfE diff --git a/src/main/res/drawable-hdpi/ic_folder_black_24dp.png b/src/main/res/drawable-hdpi/ic_folder_black_24dp.png deleted file mode 100644 index 1d25a2d1f61c1c58acb3a19bc2be8addcc0941ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K;m#2$kNCo5DGY5Ga0(cGw=y&Y9 z(NUN=orC#6tJZY=qx&K(?)(Oo*p8|>krS9nPtDIuh3|QdM_$FZSLG$%u erU`tPj@dGPOY#&^c4f26vgo$JIQuoNuweL!NTt#n94#(NQx8-ir+yLu?k^`g@p=PvH@EWK>{{{wQ1Hg zM!$j}NOodj5e&N^&n_^Ree7(V|EY#^=Dzn1*F~glUEiU~*jVMzt~K*!V$rtW(gd9- zbu{FjO3KTzuBjAWOAXXl$fNKf{BY)zm!A9REI9iLS>kQpxeVZvx53@Zb`yfHL|%kM z7b1(H;_q5u$wQAUftI6Cdxyw&IPC#gb}C6u-3IqVYD=Ik?#)&3?fm-)T#0)XS9Dzp zdZtwRcm6#Fg_v7aqc2U-S8!bl>Zx%!Wz1iHP*7h1EtdEtiPg0+lgd$ zRptar$?V!B(s3;Rw1bJ>FAEUqP7Ig%``VD9KhvO|EQS5XPkXN=kHVhRKs_x}>Bib) z#WpmgV=J>)l}!s~V&1BrfuWI+p@AJM=3G4f1Nja=p@p0VaM zNnvFN&+$}!poPl?Tv~k8-5w5+cJofHKjH{6G-6bEtY%|&5h}x5S^Ul^% zcV+1d`v_KIB3pL|bV3$>bBJ(<`6HV(0`z3;;v>C-_+6FmGmQ4jaKdJbpfq2lzZZk1 zjBbEM5Zsi01A~V$I%*koO#1gR7|SSU8I+g)2m?6^5|%*;bubzX4Hxy2yf5eqN&J$F zL4}2=7i>eLBfUQ5(2r(_8u(&hjXLjT(#AodrXM>XYCw)fo4Cd=JZAc}Zt1Vz7&RbE zkUc!0uih%nx8NUSfqP^LmqBn{V!AA;td6!y1cwsA4yZe8MaR5i%4tm2SZ69RL$(m1 zgD3Tb3UM^zRC%gqBZ@?F=;5jQL>rg$xZLKm?snOZl@u45;~8s4gAL36K@Mq<;hz*a j$yv^EhU4sH2`hgALS`00000NkvXXu0mjfQQ6uH diff --git a/src/main/res/drawable-hdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-hdpi/ic_inbox_black_24dp.png deleted file mode 100644 index dfedf997a549e9d6889da5b3ccb36408f1c8148d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmV+g0s8)lP)~!!6H%hbI#wX>q00000 LNkvXXu0mjf|k0wldT1B8K8jHioZNCo5DGZ%Rq40w)Qh!!~L zq0=2=#Vnxa;r~xtzopr0A_bFcK`qY diff --git a/src/main/res/drawable-hdpi/ic_label_black_24dp.png b/src/main/res/drawable-hdpi/ic_label_black_24dp.png deleted file mode 100644 index 9071a291228488aee572400e1bd424057df9975d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8LpYEKu(kP61+hK4``E(ys$5?PW` z90!!xDxHq4N&n$5^5;}S`*{WX9ZrWnXf_MvHD@()b+l&}N?&1^qQG*x+Ny& zDs}EK%9Zszwq}vv!EZAh1>ysDPkV7;qgqH-wPA?S6^BG!k!y~LwjyE%Cl|k0wldT1B8Lp9Zwg>kP61+hK4``E(ys$5?PW` z90!!xDxHq4N&n$5^5;}S`*{WX9ZrWnXf_MvHD?|4;uH9C%X`DFtvh(L7&I9swKSMt z2|f8ls)Zr=pw@na6#-cS>W57?+?vdz^F*?Rp^eA>;Hu~orW}l32UqbP0l+XkK+uCY8 diff --git a/src/main/res/drawable-hdpi/ic_menu_white_24dp.png b/src/main/res/drawable-hdpi/ic_menu_white_24dp.png deleted file mode 100644 index 238cfd66b4898d94602df3b9939f2937b5f94b34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 92 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>`VBp6OsFEs^HOeH~n!3+##lh0ZJd7_>!jv*C{ n$qJ$${{R0kKXb{>s!t3I&*G(X-_5)J6Qs@4)z4*}Q$iB}y>uFl diff --git a/src/main/res/drawable-hdpi/ic_mic_white_24dp.png b/src/main/res/drawable-hdpi/ic_mic_white_24dp.png deleted file mode 100644 index f316b84b7f2e1c2a26d56b9be4b78dfebd642ea9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 363 zcmV-x0hIoUP)#%S;# zN%-yVz4a{4J@?#*zZ&g!UC7zfQ4TZc)>Cc`rDbZJd6_e{>7X&MGoB906hWDEP*Maf zeigLvd!fvagXX^<(kYRsh={OI1kFW6sFFx@mWF0QQ$&P`B4{KcLJOEF4fTQkhzNDg z3z$RwWi@}zawe!5w1y1 diff --git a/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png b/src/main/res/drawable-hdpi/ic_notifications_black_24dp.png deleted file mode 100644 index 458bf11cb6e3179fa1e893729699974a51f579ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 251 zcmV!Z@~uK$Zpu(#&$yI5 z<5H$~{7+2?3j29N#M#Hd%w;arFtH>dBcwxl`38D{x6sU+WPAVs002ovPDHLkV1li; BX{G=G diff --git a/src/main/res/drawable-hdpi/ic_phone_black_24dp.png b/src/main/res/drawable-hdpi/ic_phone_black_24dp.png deleted file mode 100644 index d4077acf91bca566c143501ecd3589960f297eef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmV-M0lEH(P)4oZOd_E%#fpSbNL+;V=L!_+Etq8MiDoruwr~#$o6U*>g@g+b1re>d16c(P z9fdfOlatNt*Esn;<^JCODPGczkkO<)Sc@E`CVpr=l=ejE7NuM9U%b!vbbEA$5*f9Ur!iSto>EnZc+= zKcwy%$7q%Bkh)|HqcT2q#ROFu`*dkAk0a4ROg%7L$#n5?A3Sl#F*$#5gVY-vGE-TL z1ZDinbHQTF$hA{%@8jh(A*gX=2nltr4IyEPQ$Ee1Xp&8OJP(Bm45nCNi;`UmGDed9 Y0y5j*N*3HAS^xk507*qoM6N<$f^r^!$^ZZW diff --git a/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png b/src/main/res/drawable-hdpi/ic_repeat_black_24dp.png deleted file mode 100644 index d8b42bbe4a9084fe0af6c56bea53acabf7c072b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8ou`XqNCo5DD;s$aDDb#klx_`_ zXbrTHTD+n2^0MFRPj`K|Yk!hu(e2$!7kVt6ywHnx3csOgs73VIkd<>8wfNs&$$BdP zO`StRo{3GNLW#k#LUH-O(7M{+%{*&aOiDudj`&my80j79`7W)QQZZ@5eyMX`_@$Y( g7!J0!yy(0mch&rQWwgEuC(tDfp00i_>zopr0QQ?eKL7v# diff --git a/src/main/res/drawable-hdpi/ic_save_white_24dp.png b/src/main/res/drawable-hdpi/ic_save_white_24dp.png deleted file mode 100644 index dd3f1066462df2ed7e407b3443a8ab28ae8064f8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmV42EYy@ILa0M5s>6LU8FOEP0!EMA1UJnE#X>H4|#tUDM{qm&kf2dMhR)ifj z8WUZ|7;_;tCIr>VOqfCg&;~EnCQz8@q32GR5=%FAqdn+F@^p=hssQl$U@002ovPDHLkV1jXsV!!|Z diff --git a/src/main/res/drawable-hdpi/ic_schedule_black_24dp.png b/src/main/res/drawable-hdpi/ic_schedule_black_24dp.png deleted file mode 100644 index 55882893d1a922b28b20d5af22463a4440feee82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 541 zcmV+&0^BOKR6Otr zkRl1R505I1?)Na6%)za@ukW4vo7>EP{@I;*+cJv8+@Zx668iM%vBxG=B64ww2H&xs zNO;5~8M#k_O^H)#3?R3K7$OK2CUtxfl zGb!AKOh&M%-&KUeZC$v@Y-DtQH*wgKWCJoAK~s7*aM+V%C702R^nAiWHpWygqq6jL zap+4j&Sg}Tp7T6L$6U*3q*t5fe-`+OUIWh((O2zQi|G zw6z|z+Qw>hXfi{YB1Ou~vZf1{(_k3NJso=}PM9Yn7pVvSZM!T}A{P-=Hu+4KbAEBk fN7k7mV)Xb6NE-xUCX>3B00000NkvXXu0mjfGv)H+ diff --git a/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/src/main/res/drawable-hdpi/ic_search_white_24dp.png deleted file mode 100644 index bbfbc96cbce0dc0bf2a0b5ac4fa924dab5e34919..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 396 zcmV;70dxL|P)MlVO6$ z;_nvIa)$r8oBh5veEc|b;H00d8XJzB8#}e9C&kTuJTUVGfHxC^|AqQ$xx5-GhxGjg zEIhh0QF{S=I4p;1z^yImyK9a$ptVy59RMztM>fsDtPGlg+w5@HC)kgn4PRK;>X_bu z>liu$k6lAU@DxMm;HncEfHsE4VA2Woz#@iDLEQ;$gC>Udz>Bqx=?R#|P|q7U?)b51 zFp8mM0vel{;U#$YTMYT-70m4}o#qm7R{GY4KES6NLjyhAPCNtV)=Qz}P%ED~n5xR4 zWXH^M-kn(oJmjgYZr`;ht%b(a==+MNfO}N{1?^|3m7t{Z0Ju|yP(a=1sbqEPk1B)$ q>JBiDp_nQ^Q9zA@J6g3rP~3lFwlD09o&!k$0000bdAc8oEppaIOE(LXPbaD_uiXgfuI0y=Ui?$Rg z3N9|rijvq&CiQlchlhJevpDqnjrr%mb8?c{t6qzumxlIL6n!zIh8Gl(U}e3LlM0Ef;V2BeJSjZb=;SQ|z+u z4yaibL-bf>PG6*TZCbM}(t2i;JWOXDi<+RJrJZgbD4Fy&xy-!MTym*5Ce+-mj<=}R zs*bfH=Sq2RG}Riq#p042E*7&*ne}3EUJe(E*_zBou{bA(tHo?vL#bs|A+IvyeHm7t#M^wEtHOK?m*3tk?OFDx*kh6Lst!v$eu1NdssLB&DM32-Q z^h4~jZ>A+~7n2>4r=NU@Dq}tg9ji`Suql$(%vHn+eg}v!7dsOm%)+nCb00000NkvXXu0mjfkE75f diff --git a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png deleted file mode 100644 index 97ded33b5558a0efbd7812296a52325b4170076e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 460 zcmV;-0W=4>kIV21T<&3Kg>clSSXlU}7 zNsTbZb7CDT8exhj%*e(#KY#)6xy}u?uzckjH(4PAzEPEh1-w0q?BPAtVVvU+$MuUd zim^-?Z*&k19JY)eT?W{4>I$)hC8bSG`$%Zf$FisplYAzY(o}#3ePW-OP>dHiLTyE8 z5z6Vv#(lhunj$1*cz0EVJ9s@A*ucB3BFy1+WndHUmWuEIZ$P35H8Q+=vQXg_LqaV@ zm?z|TsTk9IA=am%09Qzftuv(%OIZ4}NVJa{^Q2f76=H@QTgC>PWY~7OsDpS*8Lt)N zEWbIfpG@m8p5YBC;_%wCP~|(2vdmRx>0#;8WR`dQ1-2NIjXDoGtr048h%M+pCV0dp z9SxU>omUy0Vn}G0s>)%9(6-8A4Tr6%Lb0000|k0wldT1B8K;m8Xkih{y5d1PRu~2?kC7dHF N!PC{xWt~$(699bUB7^_{ diff --git a/src/main/res/drawable-hdpi/ic_timer_black_24dp.png b/src/main/res/drawable-hdpi/ic_timer_black_24dp.png deleted file mode 100644 index d9ae15089c43d2bdc373704e6cc776d9e1aa6859..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 504 zcmV%3+{n+FpDrwD<{U{T8~ zT2~bIAc?dzC7a}MDV&)*bBoADpR+sXc+h)huKWubEJtMcBNnzJtOXC!|FlKfM}szR znedJGw5hX~UzTI!1W&O&;xPpPQgkU2U>*0cec~2bde}@jfRCNLRv+kdjUyz8%pyUa z>kQ@w_DG?%iFeX8rO7IsVq9jb#(ZEGS}S=bO`pi3lcO&^Pl%#*QChytZO3vwifM+D zJC8S4oZ5ZsY`374}{Xc`Z?B>8i=l%-HH9#oNh`EPxrGv;Tcq0ZKkB)v5}t!FIdQv_L(zOTg5xF8Kf()iiW$mdNHE7VQhCx^~K zbx(Huum6odZ^$dea9Yh(zDxZL8wjvNZO>-F4GJWQ5G6^Gn|xN4mu$ztTJB=|#BJ7K u>=+&W|Jv``LyZ<)#}R{ diff --git a/src/main/res/drawable-hdpi/ic_today_black_24dp.png b/src/main/res/drawable-hdpi/ic_today_black_24dp.png deleted file mode 100644 index 03680a762a3a230b46fd62810844f5226e96ab26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 191 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k0wldT1B8K8o2QFoNCo5Dsg7KS3`AJfZD+Et z_~^2K&+i=C8yG8Lk|h?u%Z1c%^x@@9T#PPR9h6u3GlKRC)5P znd+$*+_k4_GOoAK5iyeCYArc5;f3peiK6GF>n`xbUTEK6wK+Xw_2E9NyZdebnR^`& qb?2&?P%gwPBHPLV(tF?hQAxvXab diff --git a/src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png b/src/main/res/drawable-hdpi/ic_visibility_off_black_24dp.png deleted file mode 100644 index b21a6862977bfb79d5621df754b90e2915fdf3ee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 507 zcmVAi)KVUe zz$xNZs6{~u5yS}^F1(MNM7mpj-_7UYBju9)HRgwW>+{Vm`~0y=Ar;@IDZ41H-_L{^RWs|lX>&FL z_S9Yl9aXEZ#j{f~VJ)HF=z&;|^<-^Hq^Md>cHTKC)NZvtj#P`wh5%jR->qnsbT1&E z5^BVEPn5xA*t`P(XTxwqRVGpkpd_CC6hMd&*sFng~7-;fB{4^MnixfO8`ZR{cW0$~!NYP|1Y@Y;xyJ0v1${vdp z=ab*yZArVmPM|eaz%f@{ktNhn4=|?DsiP zs}3os>RCLyc{64_@}>T_OebhooMuxt!J6N0?fLsPoS3j3^P6U%rc>gQAlyI{<}N(MZ=^SI_8AdKR>jhetYHDLjKeOh)ZGy)Se>sD~ ti7V97rYdY)!O$66q*f-$Da+KL#xIf1*}haLNFQhkgQu&X%Q~loCIFndEw%sv diff --git a/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-xhdpi/ic_arrow_back_white_24dp.png deleted file mode 100644 index ce5b878b0fa37a263da66cfe403868fef2d4357c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DI8PVHkch)?FCOG diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png deleted file mode 100644 index c94dc6a74629d2bb776a030350b6ff0b903dfbcb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 428 zcmV;d0aN~oP)Fm?7{}qKdOH{zu}Ki5!EWflAO<7^2?h~E=XSA)$$&vZFc^f0L}D=t2DNA~Nt)`7 z#biLQ4wV=xxw)_8=F6ApDZ@GEHiq;3#&`Iyug02bv_!7E<^#>ZkOOXtT+c<@)#ikc zqEOcZ8&x*!uJ~)8Y*W!4A?KS}vld0JZM_Qii&WPQVzL^nMEQ>;)P1ZNE)pg%Rq4&nrrsbep=JbS|j@@du$)q`v`(Q-vhD`V=QWFN^ zut+^OAaB#aS0$Yksm)gNFkP3Gv{R&}tY#)%7nIf({TA)A(ovCmrnEC6wd8^=Bs*O7 zE8kA5;E|BiF|Tb=$a$fXmiyu#O&e9&ar2^>FQ%+hlYOp4=MYgXVtvs7HoJSWru2YtEc~ETVWc7`%<>9#>498H%zbaO2ktmma12~4FC#T zj$O#u0N|F0FGlQEw=V!tcp?n~fUbyv5l13=0ANf0-N2cMRRC}-;<;tbZHhQGVklxB z0IJ(BYp&22u}|}XtC}i2kg_%EPjmwSychA(HJ9t!)R(dYHC~Ij3jprO6ur?=P)B39LM4Bv6&fX>1{8Oja&h936e{&7?Gv2pQ4o25Emgdv6Yv-M95N;+<u zrN1-7oHI;W{GUhiJkRrbgh5t0rACwVnmn<`v^pVVlRDkor=agK#y!7vPC@N4#w)RF zN{o|JY805^kl3EuA>5l4xRbau8vL zlo|n5OhrjFF*!MiFvCiTfOTS1N}`6Dkb_Ii5hLn|kRnxLJ8H!VW=Rg_>Bbp(wPFQx zL!TUMk<|`)wZi~!n3BF=jtlB^*5H8(Q~DldOhi$=K|gnxh!TD31x9%xcEd80z5JkR^*J^*zT$p0@;*+&k^zhirq9$yLEza zx@#6+E^~74q6q%J-OTX&!sXl?o&_&t>~O?@F%?s$RE!yL$Tk_tY;ej?ERcIXvQ9Ls zTrkBNQd6=*1U-IZ&QugE#4EmH3#O!vlMXjnM22*Hzh3qJiZ+dW!4gu^Ko3jIdkC}2 zpX7oEmI-nppFh#%drwl7*tAIY&Bjk=2!VZQxD?~5ZLO8#=S%DtGK0w!YBE#hwAm}?a8}i=CY11oFbr~Rdi+HJhDcBa^aP^Cwk+I zAS+Z@Vt%m%VT$B}T^cBp^q*;@%`jU3gB%APhLQT$IB8Qx98S(c6g=RcoLwSV=A61w z{>T|iMDvyt?t=1Lj#(p_j4cl6Gh#wb&4dws_SvMxGvI~4d!jIk5EVl`00000NkvXX Hu0mjfY7OmW diff --git a/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png deleted file mode 100644 index 6ebbc831605f2f3d1a9461a6c13f0f7bbd4e768d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 536 zcmV+z0_XjSP)9oFp+@@KNp=; zrH4`mYS1K9dYH>Vi$JU!tsa_x5U6!}vGvrys8Z=IR+T8V%T%s=x%HIG^gyKtREa$q z*iz_yyIZm$0|~b}y&`eVNCpfaaLJ`!ZasE!Il>?VtjPn1OzNG)SR6PHy!0KJMeieX zSLor?e@%TcPD8_-k_mfkFw#F`htG2$ ac76jC-B;5p2Fwru00008DEZ3V|*s2`1aV~kzx#D@}&nn~61{Xzi+b(jKntiPo%%5fP`-@uPgu|~7wTA~r iR9eY#70Eo`TEl2=&Qt5V_=GOd^$eb_elF{r5}E*W zOA5m<3jYBNi%A&<@ZO?$P9};P4Y5CjG5$M&YXI45J{s}~# zf|&?x1_gn4B7+hS@X!l}&!voFhmZP^sujifL@~PKMMM~{6xH}^g$q7WOzwCQ5vHTU z6`v~H@rlA8e;CUh_(b84zg=+ih`wG<)HiJjzSlQx5#CnjMR;A)R^jtaTa9;7rSy)7O%~`cm?ZjXImW?6TYRT<;U^@VKiSj`soFk00000NkvXX Hu0mjfhD&W| diff --git a/src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png b/src/main/res/drawable-xhdpi/ic_cloud_queue_black_24dp.png deleted file mode 100644 index 4b88311a1c08c5cc005d71e52149aac2f2db3fd2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 534 zcmV+x0_pvUP)i9)=*PRbX!`Z{(xG- zsi`dK2c#82VqQsZ%i#epSG^vO+x@)DdEva@hx5G8<*HCsRn;cP-S@_{f96ejZB)0M zOl)`4PsK88$_?ABQNJG%SiZ<9snvR@Siu^zF5Yg#2=DQeVGQ|QUkQc+Fz9pMB+38S7Qu~-s9&@rZoTTR0tH8k|^&?-C$Gx(&IevO^ z$>-LoK#b|Q8rkWJ{}U}1G9Oe%;*#+++5B}_Haf+aLbI7DF_=N4I%9Aq<$yDavBsUZ zPkqX(?J}YeS-rvq#mv`Ti=6f+)A(Ts YKP!&cPd7X?ApigX07*qoM6N<$f=~+n)&Kwi diff --git a/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png deleted file mode 100644 index 388b5b060af924493b057a63216fe7db75d4435a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 151 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DI8PVHkch)?FC64-Fko=L=%?Iw zv$u;+&1tXu2b~*Nwk`N$?;xkbvPe<$)w&zy|9BUkVz|Zlf5mTGpk6SDXXMMa|9v2f u@g#fN+oPXnt4Z(ZaQ*pHX6dTRMUVWXo;a(XeY#{ZNU5i*pUXO@geCyi%r-Ls diff --git a/src/main/res/drawable-xhdpi/ic_event_black_24dp.png b/src/main/res/drawable-xhdpi/ic_event_black_24dp.png deleted file mode 100644 index 4b3cefa2bae6567dbb5b6bf0352d7bafd6ce8964..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DW=|K#kP61P*BrSH8Hltz{BN?c zT|BFJLsZW6S33$cIVaiZzWB45w`RiC$L*JkYv1#jFtGc@1Uxn~VxB6Ler4xUH<`c# zYF%d)4|r|V=8D{S`#%F))NT14^{fU74(qGsFZ4AqGPAv6Wn$arFTdZCMMBeT!-8{X mRaOWJXCHswqtaCTj`4ezw1|hsKOdlT7(8A5T-G@yGywqD6+;gI diff --git a/src/main/res/drawable-xhdpi/ic_event_note_black_24dp.png b/src/main/res/drawable-xhdpi/ic_event_note_black_24dp.png deleted file mode 100644 index c7fc6e130ab168d29b27035c2cdf840e9901766e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dc25__kP61P*Btqp3ls(Ge6V-O{mp#-Fk{qq2D|s=a*>QR+$Z7~q?xy}3NYwI*VnO&FF3v? p*{N6BGeF6x`0&#&DvM6+6rZxo?t`hMqCU_`44$rjF6*2UngGh8LB;?8 diff --git a/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-xhdpi/ic_filter_list_black_24dp.png deleted file mode 100644 index b64df3612a16d378c6cea2299ab28c16c39252b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tJx>?MkP61Pmkk9O9C(-xe$W4< z+^EJn^QP;8P@4v;`gEqsfM2hC7=F!@<&mdKI;Vst0N}G6 AdH?_b diff --git a/src/main/res/drawable-xhdpi/ic_flag_black_24dp.png b/src/main/res/drawable-xhdpi/ic_flag_black_24dp.png deleted file mode 100644 index c27a168cb6d2507a6e879781a64cc104f5a295a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 130 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}a}tPfr)ekP61PXAkl^2r?YFu>Y9( zlq6!I4o*(U^eIEVBln! Z$;(tYW3Q=Y?Gm7&44$rjF6*2UngG}MCPDxJ diff --git a/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png b/src/main/res/drawable-xhdpi/ic_folder_black_24dp.png deleted file mode 100644 index 49272b0f94868394c8be1c63c97e8a4877584b28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0DYEKu(kP61PR}J|N83?#ste^ED zxkzEj1Q{KdBdP{h#N0&gxs8U&uF3XJkIyz$5X)mYFT<+r@b2#+m(G)?BxavDhX(5DBNQy7eKM&Aow=E@5eS$zl(}GXn zrXVHc1uPY$X>6sfdN0CtF(eS~nLBeQ*%bOYyUCgJgUQV0+Le%EmNn|M=nxRlp+%il zW=JuxNjCUSsHr2~FoCl>><|zd%BRX04(9nuXjvUfB$DAhVZy4C#!`;YgbuYw4htF0 z_^*^HkR{7QmN?Kvq%nFYZ2Zk4{XEM25f92>UL5}n$#XH{W&FiF6}Bv*vm|t%FpAcW zc=lb7*yWN7J~4&jiT}km8k6F)D)+|!>aCsiB3_G6?=GSZLZJ#MyM3!4QKrN_6$B~G zHz$j7*|&O*azos6h)2XMp?w(wLZ*pWOBC<{<+0}X6(Z^h#-CC^sc1TCM6?o&e}ZzK zb4^c^h>qp>Gm0pA4zyiuA_A-N7d%C|&3;Uu?;5axa*HpqeZJcf?bFpTbhh38i>nSfs4Y@Nx*}J5jK7$*W=eA17l|TI?HqUoKv|yd2z~OqFL(zO<+(VD z)eY0K4Bi2-V%D!=wPac*69wEc>rb$ezlXs@0VmD+N380mr6*B9-mHJes$p8vi2^ca z{Wtq4bVR8p0VTfxP>$n~AMr!F{f^K0;x4gy+&%22nAejYC|7BF-pVXf!im^b?vJ>V@bCg^PeGK9K=q!F;(2k!Df2 zI|Rmn{MB8E-{P-RUQ-*i;UU09n%8oBBY2qQ6`c;>UdD6JZ@fmcLy0H@)MWfB8Jyjc zZF`g{(o8=KgwnT37anp{(NZBR+-8Uz0U7cPGff4J6z}Q6Q#T9lpT` zB$whc?<}K3Dx9Z{15jXsB|cMUmtTCN$|B?R^3S!j`~fVlqv&?ci`)PJ002ovPDHLk FV1hgS7IOdq diff --git a/src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png deleted file mode 100644 index 078ef4d833b7b38e62338c93b405b48d8453f40a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmV+t0qy>YP)H4MyX z<`xF7!0wU>b#6K$p3s0jV>X5WGiDzs%1UNGgxRMDD1atA2PnYTzXSxuo_K*{LckB$ zgn%Eg2?0M~69PGarhq{R_yL;`@B=m>a3%o!ZNS(CdsS$SP|*P`~Uy|07*qoM6N<$g7$E4s{jB1 diff --git a/src/main/res/drawable-xhdpi/ic_insert_drive_file_black_24dp.png b/src/main/res/drawable-xhdpi/ic_insert_drive_file_black_24dp.png deleted file mode 100644 index ffb07138f9669b5e595a3ec4a405f62a4e3de894..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 197 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D9#0p?kP61P7aX~m9C=(WTKRTw zf5XhFd~UDXme^H~uf-nX_u&4zc|H5ZDLb3b?aJm~$9=7Y_qg{FP0RjHUDFtad7KWS zkESvev9L2RHq3aypu!*^EW-e_!LcD<=}j-gN@a#QjLh~7-|887Bn%P`99V2(pY$Mz uX_|z^tG4Inrkc)c9t1jf&r&;6%b;nKbD?QJ(*dBn7(8A5T-G@yGywn!i$I3} diff --git a/src/main/res/drawable-xhdpi/ic_label_black_24dp.png b/src/main/res/drawable-xhdpi/ic_label_black_24dp.png deleted file mode 100644 index 281364540cb28396ff70aa411ef806842695d18e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmV+x0qOpUP)Ai7~R1}oJ1T&D{&1Qe^4@o7J?fnh?NkQOlFN!8hVBw$BFvIS8CRYq~ZxB_{;`TT%bg6D2U(%C3{E&N|%vsZ$Lb- z>?I9F0qpqno~8i* zOe?yYf_WY-KcuB7fDJzodzykxZNY*+qFc=oom;x3tG%YXnuj*B>;($aPBO1&#ZD~R;=+S1uohH0vO;Ty{1V3896S(oQy!)9Pz|^?MLlr?bnZG?Zk)D hZvH845{blA^9>4rlh*m?3^o7&002ovPDHLkV1kGuhNl1k diff --git a/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png b/src/main/res/drawable-xhdpi/ic_menu_white_24dp.png deleted file mode 100644 index 193185fd8f2b59ce59bafcd6eebf4772a9acf12e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 93 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PUDr;YEmosql-|Yvp75WH@G-;5;rMmp=!acAZ~6h{u2&vP8JI)D(y`~u{sNd zx>y7uB-Q5QQr;mP%S}8N4BY3P-uHXpfy+5Bw=q4`Xj#$K*Vl1ZOQT$sJm#D&0X}Kx z6trx?h@zQKup-5se1fhNMLt1aie5f}G*t_RQ!m)BTJU@71;45m>`lF3P_>}{9}D)t zO@}YL-N={0puAuQJcz!K;$`Fy!FGAU3-B!Z+fpn>z6RFH3+{uSlLvj%N23&u9Hesw zV70v9BH&(3=6w*L<7{NBfD7Z?qIK}Yd`y~_ZR+XSu;ggW&-)3Uk9SQk8-h1xG!Cg* zn_%eDxbNUGVBP7zo|*Fs@M!#p*76qc)s^IltF{5J9h>AOpV0yE&JAtx-7P8rY&bRP zsyN}P0N;J~#jXHP%>LUhy6&4a?6{U=*&Vm!y-~VunaQwCquLe#ENEx_eUAbpvszFK eCa+ph3;qD8LA)J0pe6_a0000522kYw1dJZ+Jn>rA}XX75;O|aCeh&5AVeX`qwfvG_dE0Z zU4jLPDQI}(ln5^h>}Mx<(R6_tFRVA`_Q?lM8|A>uPMa(3Z*vOrO?g$f>BCDjpJ)#3l+#Zr+Iglf{l>;|OUgW?tl21ACfyDHM zKnR4u+5*|6KqjBp6Y_aIA)NPJSgm)gw-)EF2Z0jjcB#AbuO#3jaYg&Rl7wJU Zz5skO4nENMm&pJC002ovPDHLkV1n_-ctijI diff --git a/src/main/res/drawable-xhdpi/ic_phone_black_24dp.png b/src/main/res/drawable-xhdpi/ic_phone_black_24dp.png deleted file mode 100644 index 99f28bbeca97715d85975921dd64fbde691c7ed9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 408 zcmV;J0cZY+P)Jz(nTd8(K&U>#oAFn^y`zjyGXQF#zM7()Aet$noem0I<%p-vB_K zOIkhy0F#7VQy1oIC^F2m$2s@BQssv}HMU74RQ&>86OIco?%@#t00006 diff --git a/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png b/src/main/res/drawable-xhdpi/ic_repeat_black_24dp.png deleted file mode 100644 index 75ecb04629f53b5f1369703b9db5e73e6aa28869..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0Dd`}n0kP61PmkhaB6d8_Qkg+xY zADw6GksxvAeeHrz6Z3?&&x-I}qZTGy?e!+%+5rRhd&REo{W6SBoE)kOQyK!8oVW{k z?&RhFE#20zh9yN+L7Op>^Msc}*@hoK-Y_;M Q1FdH8boFyt=akR{07Z8<`2YX_ diff --git a/src/main/res/drawable-xhdpi/ic_save_white_24dp.png b/src/main/res/drawable-xhdpi/ic_save_white_24dp.png deleted file mode 100644 index adda095754f015a58403af02df101e7213f3fa2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA0wn)(8}b0D8=fwXAr*{ouiIy}ILNd;e0ik1 zL&59A`M*Vsf!~yN-&Ah(m2P6Y@~YRDtG;K#iRnrf@56a{K3{q4q*%J-j>M1L^E>wD z_G`*BEKt%ZU=9!xlW_2kcwqhg@J~+L1PJQf&&tujU~xgSfq^Aq(NdMD@Qa448^br9 zJv*meXvT?xG}dmujKX) z7Uf7~pE^uhc}Hmek2Wta$-TF8KURXjv%Bwe&NJsZ?+e2r2ZAL1Ot8os8tk!0gH@g~ z#sw0@<`nn%LfdC;aEl%yWAlVP+J@DlMwSR%p-DU7+G3DUSWNFbV4E3A6v>hzMUEmR zX4&4SsbLY23@_1*yk(d!yy#|xHB`xx=nPos@%&~K%b>2Xi&|h|M8n}7X9z+sbu=jB z)2j3pd4giItosK4FKp_s&l3h)Z?Va7e0eOQU*6$J)h8%@iz(l!)v+3d&<0SIy5l$9 zceOFCNCuY1bQ2E}e3tSsL^6PqC_d7Gi+(BopewRLh8@uqaWNsK8Hj8EbD|l;#iEo- zu?)(hS-{1rUM`M7pJ-Na(U4L$mVvF~=0awGR4jwEXj*X$ijfR7qMXs-57XpL5k-6C zOFFAfu97r7a)dU8POh`7hg=NPrsGnY#l&frXsf!1f0>u>*ZeQHO*dvPvo87_DhOow z=^u20Pf{Eq2%X%Ju%=uAeV_vm?nrqJ3&j}LSB?MxDQ$sCJUOYeP$4)4*DE>{@S&!E zSI!cab2zg50lwsP-0Ikbp`efcon!dJkT&3Q2#W%*b>9F69;viWZ@_TYb%NEr5MLi{d1C-p<68E9+b%7MTRnURLL{C2#BRY$+R*@nLcdNq_OFv%seu++B-=? zF~k<_fa@CrL?BCzmho_h`y3@QC%Daq@8R#6q(E#E6d7lM6}D*Mu*nMZR5?!v2Y^HV Y0-2i6mk}lU*8l(j07*qoM6N<$g0Ss4Q2+n{ diff --git a/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/src/main/res/drawable-xhdpi/ic_search_white_24dp.png deleted file mode 100644 index bfc3e39394246b221f7d4617aa5600a6406aa7c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 465 zcmV;?0WSWDP)D8CL_;(V?AVEarj0ldk$~bl6y3&Eqek6=6UA+aBGp8+4bCOt0yJyz3VGY| z^>9EE59hXLP{{L0Lqkciz%eblTs;71sDpKM$pE;wf;`qWNA#EmA z3}Zav^tfQ1X+{`jh7B(9+LToU=QvL+>I0VO;G8NRYdGH+S07Zk#aU4-eqf#$*8o)L zVD1%%1x$}ceS&42s$y`AxljOCm_x;&g;`eso0uELpo^JS0JE4E#URIwD1Z{?O)C5yhj~>DnwSj*u!U(V21l4n1#pdNCjP>$mkQ{TM zA}DjpU_DNl!r50btZ+|1chvL?-kyr0${{zr@Wwl@G-*)PA2jglN`V8sx>8^tZ&xX> zhqt2?sN-!b1?qU2QeYP^Qwr?hWJ-f=e#?{&8JUKL{zpFn4bJ?-H56sJ00000NkvXX Hu0mjfDd@)s diff --git a/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png deleted file mode 100644 index e84e188a1de15564930f961aefb5e591b2fa34ec..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 557 zcmV+|0@D47P)Nkla9V}f0{{|82kXi@9MRd@?$weK4A^ju7 zLRBcZi6~YV4Y?x0YCBk^ee93}@A5qN9`;=V`Fy9md5-r894+Q7Vwa zKGHbsTJ3CbB>k$}G!3du63TIxO+;yvI}8$@RV#hZwGsJa1 zG(UeLOQIW*%YP$A_S8JsifkZzY=a`Er-+B1U^vMR;-MW*pvdqV@zg66vq)lJDKSEJ zw`0sxb4<_B;v8FuS(#q`)kg&}+hPL6xOrb?GQ?%fExvFHL!Kq|$LU4WPhFXQ&M?@z zxR1mtVOeOIy~lo>;tz)rETgf>fK;}TNLegBvB^KiQ=u3Ot|-Y( z2Uu+mzU3;1m}L#YE?|a1uJMlWb*&qR^Q=+kG@*msHr|$gaEk##XL&}z6#u1a9Hidf vu2=2VHre2#z3N8+Q5wRd6(rV6I@-ivWBUX&LwAlh00000NkvXXu0mjfs0IG% diff --git a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png deleted file mode 100644 index 5caedc8e57497ba9d32c3a1798f7394bd8ca7cff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 562 zcmV-20?qx2P)lpy;7r2s24Mgk2IZK^^iBh`hXFsLp$Hi^-XdC|o$nN|w}JYolv9aiaA3)AHJ#jL^+Vnw!iASI;~WiKXmD0RMEHO!?-j&6;kHOKLX;?@ zWGE7DPJUcs54$WqYC|tM?Dm*a5EB$J%My_f5ptOQ;JnO8utv}pJu;w=5<;?v>&>8 zhF?Y&EaUf-F4>V}ouDGUG9XTwpfwUQW0DePIU@2QLIJZP6AEI68g@DQ)P^_(>}pKO zkE?_$vBVfLVvMs)nQ&JW#5%6Ll?i8P;6j~onehS_p38;=e>tq*49Si(?RM$JF6|Z- zhLe1y=@Yj&%{<$LDKkeuxA{!dCfy3hWwyzZQVXYeKoyfe+#{|QF7lc(Gdc+Jm}KP& zE12AuD=c7gL#~j*pF diff --git a/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png b/src/main/res/drawable-xhdpi/ic_sort_white_24dp.png deleted file mode 100644 index 6d4af1bcb9cfca69b57074df5661914401455d1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 101 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZA`BpB)|k7xlYrjj7PUF7ee{N#+^a1JjboFyt=akR{05Y5zCjbBd diff --git a/src/main/res/drawable-xhdpi/ic_timer_black_24dp.png b/src/main/res/drawable-xhdpi/ic_timer_black_24dp.png deleted file mode 100644 index a02ae51e67785508e99a1fcb6287961f6e341928..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 616 zcmV-u0+;=XP)+9d9kh>QM#F8qV8bfIXh8$r?Ps)hCq#0OAlt+i5YpFk)G zS{i5#q*#$wuJH*h6_+-8@3ypl_Q7FBsAC+pMwJv6H+jS%+H#REn3(#+IRHioFihzqvb?}3YnodG_V0(N z6xhH>g}h;me)43<(8B=ZEEDb#)#8$F`=*TiVwyhoQeuVxgA_lxj6#<8GP1=O|rHFJxKH3wY4uDhg zabF`+U2ZnI05NOVR*6uOd*9b~Kv}*Q$8Z|8EpI^|AXe<^C{7EuWh_y^gk4?0MV^QL zL;-_#^#e{jwk4k^pkPv$;T`7C1r zvy>edbB<8@wm1rUc^Vk0kQF8vq=1Jbx4gXbg>VL+~pFVdQ&MBb@0D`?mNdN!< diff --git a/src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png b/src/main/res/drawable-xhdpi/ic_visibility_off_black_24dp.png deleted file mode 100644 index 46bf0c931a0ae05a32733eb4b9fe1e9895d42c83..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 629 zcmV-*0*d{KP)^q&wHDGIu(&_c13b1fcJ zMe!n%3}Q(Umo!;|N$`?O^zQ3+gU^@ep20^P^8T#Hz2L{g^LzZO9d*=m`g(Q#{R3gW zKB6x~okY*0oX~N_hraTwKTP~-$C@wQaM?4ehxwHF*hJ(r@vV2vsZQ7^5Xb!}O1JGj zZ52C{63b%7wp`VyN<1ndCMC!{9Tj@XrYI0?A6U@U&~(azn??z->6{t8ZeNH3QLO7u zLJVD0(rXTcs7P?lxbXXt3*?Ao}Vdy%dQ7|EX~pefS*VA>m{N5rzoi0Vhwup*Kz z0IrJ?;<8A#>M_%JMI^fkXjv^GJ`%~!`$wON!bZA)u9ciXJGn1DRcOw`g!mjl%aVaT zdv<3MYo3(!qMd}emVX}P7i-ze4lX3u$T%V9ONf2vm2@$EW#4hKKy0SO(5q&2&PGBU zxMk64EltmR%NPC<1>$LERjA{hsIr8pSi@CY^%Atb>-TyIp76GBOhi6o_bpkkPUM~N zruW_Tz_vqUyB@mhhD%P6TuHTmnb*?%e@XPIi`Wo;@vPc9qp#zr|5<+n{d4iW28vN3 P00000NkvXXu0mjf>5ejo diff --git a/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_black_24dp.png deleted file mode 100644 index a84106b01fd4402e5d15b08c496a75b76e811999..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xf3?%cF6p=fS?83{ F1OO~S9V-9; diff --git a/src/main/res/drawable-xxhdpi/ic_arrow_back_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_arrow_back_black_24dp.png deleted file mode 100644 index fa432c232dfc330b9f3030b107884fa5e96c0838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawsytmBLn;{GUVh8l;=sck7`{Q& zVR_Ax^UYC*v`kq}K1#cD;CHg1pkSaVm%iV*R`KN?adVU^3xn)=_0KV}^T}8gJgAw) z%8e{3OJ=D11ckd3Zh1^-6VD8O>U1k~=L9}UQ7cy$ c7njZK9T6eN&ustl8t4iJPgg&ebxsLQ0IgI(ivR!s diff --git a/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_arrow_back_white_24dp.png deleted file mode 100644 index 746d77579c75aea77bcfc5899ae6d4d280a6db85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 188 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawnmt_{Lo)8Yy?mOt!9ajHFx-Ll zg68}$oL7?cWR&_eIJ9T2eBk+dYDY(h$E0p=vEyYtFP|-$pykK(^5DjD{>V9kd@>dV z4-PakFVFTne8@uI;eJsS!_m1q1y>sL`B$o6V&n`mzQn>ABz%bz#G2qb>ubGeW}usS iW~iUuJr^LDq<5?Lg};vF*~>uZFnGH9xvXQvvMiCb-BoQ?~qg}X>qDF35TPU$`F)qliBx{AT3yO9@$d9c& zB_$~>nH6D$wIU_SJezGFcRM|&XWwV5o$t9hulGOjxjCIvhhXXiK@b!ptKl#x3<`s$ z&|(^p)d)32Bre4Px=`-;MGKWAXeVD#o(5>75ceph4Nb7SMDFK2Mw93PML2aCVVB_z z9o(an9{wS#CLG#;tnRRt6h=Aw=|z|ZS%foBt+TY9TxOC+n6BbTCCX|GLgAR!n7GDP9jXlh_e!5YQ%{%2vZ$#W*|(hIB^tVx`cN%2-8pI;#oOE2vZjo zcy5|OAXPSb;8ddX}Ow~#v8`Hph-nlij7U=_{uAv><)Q89b?h^*G* zRm2sP)qT8cwI2HAcoxx*Ol-ot7G$EHDOboa8tWSQ96}~e;Xp4M>mB(VMJJxLO%X;3)!bkNWz~Q) z?Z}P+x=HhhG;hfuJ6=(YGt)?;N!7;!oJ!G#CR{gFxW^7Yp}b`{PeejWsO4GA6ZSJ_ xsUUIl*oUk}Im`+Qa3uV7gh393K|v4%!GEBdI4o)NY+wn5&0sbqJ@wlM7WBO2#g>YGAK6|wXuYj(u0x|#LN&; zzJZ9MO$~xNEt+hRwosTkZ7zTA;#}{Yxo4Px{-57+?wt9}d2&SkZDW#M$43Ve6 zGMm_x+2#jtxxpct)WbMstoPJ;P9F_BM+Mum{AGj&bn^t;@?0aKeJo)KXN3i(xkWxz z?(mFX*igO2>&UnAQRuFG`AB&gV9>c(GCN)hO~n@~$TesXVl?!(XtBXd(q%q=$(Dmh7H}y^ zol~TjWjz?LNEG>jF^z+qtVMhnllh(?QZ0C75|?`L>TS~NmE%z(mv)9;d8qSM=4TF? z-9tqgo)GZwl$Ht2=;Q?`mhhznTBYbMDzoGIp6$A&TtkmMdZ=DdeKVZG)mF;2>( zk8n9c)mxbjhKXhPF1P1lTn6~)p-hcA4wA?fdD90nxMUciK$UtEMYdR@$OJhO+rz57 z{Q-s!a26|hNQMqDi$z5uPQh}C1!gV+}#Dm@ge6hwLwDI!z^Ay`3ssiK!^p~vE%7K?%; zL5lVbh*Z32D5Q-CllEZaA%*1eFwBy|Y&P4Skbv{~zJZ6`*&z|faU92S9LI6~Gk6S= zBF!3Q;@aUCAGynMBxpjTbu&&5`)a(VFM7}r1zP7XBT<5q%+Y$cn+-b53cKZ5WSaY= zV(lTXC{gc9GeOB+ITdCYz(XwU0N419R;D*RXbybKoItGa2;b0Nh6N3Q?+N>mmh31+ zlp1}Fg1RZx<#6LBhYXb>mld6@2fRBo%p6EU-zvVMHzL9y(*ZhrVLhEu?YKd9>$< zVW%i!%QnMESdhn0lnN(}N&S2wzAEz^Ywkz>O|;J>5W^CTkfunD=qhZGVM2fC%>*4} z9qlO|((;7_375h5j70l`gjw*d(BJ-`EMe>~$BqX`Pk4_2F^Ek&nK9J*2`-9pr7vzFmkPC7_F31JBAQ#kO`v=64yIuT3 RDSZF{002ovPDHLkV1o1)Cl>$! diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_black_24dp.png deleted file mode 100644 index 98c59c176f6cc8c6eb7f70520cd4be1d704a7e08..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 721 zcmV;?0xtcDP)Dtva{DoUR3-+mMMr~UjKy)ZNHG_oXd`+Xr$`|LWnf0IQ{xl|)EGi4=Ws4S z>_wPhv-ehbPi?VYSKjOuQsnvf@`JsyKV;ajVFTL)B@Q{E%_GmGq&)LTn_~`GWr997 z#~w{mL|MumyW|L7kveaP=iazviC}%9jTqLVNaoFRhSIYKg8 zm53gjp@C$$Yo@SAp8t@H_nREXW^5b}(v|~Mv7DtNB;cyu|Ij7yD)`4dFTp__ z3V3&h^kF~zpIM^pf=yz?V=){2LX<7zRa@mmz&f!9rvyY?Azl1huWTc8OpqGjo5>upST^=nutnT zQ%Dw$&_L-EDPkbmIYPoX&PoVkCaD}{D>yquOr#RAnIr7u>;zG!os^Q9Bh=J;w3TG$ z2rZmFB1V#(BRt^j88MRV9N`IPDPknqIYKgUpnYH9uS@NUa<*DPatyJ0r(Vx4?y}2IX`R!+t76~&*|3Ob zr$`_69q$Tsf^+_m$3H5;L0fcLH7MtAx-Q~680Q~GFf`4-K{)qJVk{Scbk8jInC2$q zi#17)MN~69$|Gb_g-!q~z|S7<%6T$xnWhQTV3A;b=7Lvm$}8tA5WE~aG)PoR z!Y$j((#OVGVV@c;9(W=l;fV)Y)YxZ*F$T0@!-oA2HKlI81oMTp00000NkvXXu0mjf DJqt_W diff --git a/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png deleted file mode 100644 index dc32a14f962eff99c96e36d199049b999880b921..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 751 zcmV3NJ#@M)WqeNFfA8*cI$F(c%R)hLFl#_5#FS z1cS|F68OK^SS*~!GtbNsi~LWUgdfZqW-`y1exJ2|{TQLZK1Z~8;E9NcCmv{V$R10K zV026Kr73o35Fr(D%QhMRpgc8txYnb}oIlVaEi^UBrw^Lulq8*yOB1xg3rTBJN(VH^ z0clkxND7*uPMTdYmIRdLFKPFij21K@bMz#}G@wE1`0APYOz~Tnbs`5~+DNP)puS%rVL_=9=5(?Fm{rK^Sais)g>c?cCZ&x{O8llgbo~e$8E`= z28g6(fu!L;T>^a}0tHFWfeyoVPys+gQgZ+n?4W&6kqU%r4(!@NM~DfBrl96P#SUtL zmZauD(++w7B}vbLdpqa}lq5X|9_^qAlq5X|I-eZ$2@aY6O*& hE&Q%Ns1NFc{s(_e(O4J`K7#-N002ovPDHLkV1i<~Qp^AV diff --git a/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_close_black_24dp.png deleted file mode 100644 index 51b4401ca053ca8cad6e9903646709a2f44444df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 309 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw{&>1LhEy=VysgJ$~x+g}6OvsxLimbaeN-!xQItoH=3nd`|H@dF!kYp_dChV`b9AudQLRn7yg2 zv~UiON9*MGOYAy6D=_*g@;c3(5`S(Hi^X;wk8Ms*3SMP^!WTf z-E_DAd$kLMWY`Z`);MuKF9=d$?_mzLoFj7Xp~|_3ODg!(3;AT&wLoS^O+0tsvcZJ& zD(m_$dNm(!9@n+CTyDa$w$*a^-$!>qK3P{4end8+qbAwoFEAV!JYD@<);T3K0RXh> Be)#|Z diff --git a/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_close_white_24dp.png deleted file mode 100644 index 6b717e0dda8649aa3b5f1d6851ba0dd20cc4ea66..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 347 zcmV-h0i^zkP)vMkH8EXyh{JTRaptiwcq@D(P;=ehLbl?EMKm*m7(@7_siS}}k zNFtnck{HL4mc!ypcyUoqJV~4rM^fS3C#iAnkyJU3biCmDy`VZLOv=LXld^HVqQnC*o{P8blHVPUKk50EMf!^WK)a0 ziO5zG5}A-?ExK?m$mT_sTSd{0%f+v|m-pdx#yQ(L?}2(h-}~{L-}5{#JX0!_N~O~O z*v)o2;zQs0!=f90H)GOs9&(d{bs0A4FHxrjrwv)H5UU+9D;nqrkFTb^M5KeF0%e?X3D+EiAlR|gXOy2b&<74gEqJ*>Na5|j*G05jb86*Q9pxLVo+rL zr~zwzA<}&BumKx&Te-CslG}RPA@^C;=+`D(wo64TeJ*Oc>&kMmTl4rTSV5+Om*~7LyyQ>;DpF}w(|?((d0im6~)^svaYdNyn>!GXc$q3uOx zabB)cz0QC}ts}W53MuVBD%UsZPv&gw=#W`?Y0ciWQ2$4FyseJx>{`Oj#KIv^yWsd< zb^!&41_nkD7m4wnX|34#N6cTv0=_gxaj*E+Smb+hj$`D9r9sI`%Q@~%Ssl3i>7S{h gq0!eBm41aw^UfFNx4vv@4|EiRr>mdKI;Vst0RDqR&j0`b diff --git a/src/main/res/drawable-xxhdpi/ic_event_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_event_black_24dp.png deleted file mode 100644 index 2f5815d2d9f92915d64f765e5e26b2bbee32d41a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw_ISEDhEy=Vy=i#rkb^+m!|k^! z*y{H#RD7k#D(t#g?g_i%l7Qov{Ma7xDb~CX*S9%Z);ufi+s*!aTq+YBSVgPfMYMgD zi3o1k&#F7EQv6@RG>c@$Y|kB0iH@rawsJF@?)b&eT)LwwA+h+YjG%`?Ba4uRvoOP6 z79kLOmdc5Jc>*UO9FPc`>I4U-ugTWBGKU>Z*KJE&AQWz#r#MHLGu?X~;~dL>8aFOn kNd0xnRF!k-l%RR{au57@H@#DDEzlnfp00i_>zopr08AcQrvLx| diff --git a/src/main/res/drawable-xxhdpi/ic_event_note_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_event_note_black_24dp.png deleted file mode 100644 index 78018eb3d43857df902190762fbe46ddb9a0ab16..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw4tlychEy=Vz3I=@6d=<2F@MS0 zh4$7yYs4g%xJK%#a2#&{(B9!Qt+OI$fDV4x;PK5*ILq3$Ih0qbzw& vEQZMbP0l+XkKME_pu diff --git a/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_filter_list_black_24dp.png deleted file mode 100644 index 2314642f936d4617377df066a4837b44b18a53ba..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 112 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw%spKkLo)8Yy|R&!fq{j^@VEY1 zE)kPS@efw@GcYu)w3(yeXy43W@jK74iG^{)mj_KOoJzG^v6L%NQOF98Gg2B_( K&t;ucLK6U<10nJN diff --git a/src/main/res/drawable-xxhdpi/ic_flag_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_flag_black_24dp.png deleted file mode 100644 index a0e48ec80c6d06090c26fb871ac309205a791f8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawvOHZJLn;{Gp4-UTV8Fn7(MNH{ z)FVL1V!o-MCnAb%>(3LrqaRG2ukIOC{dET0tV<5wQW@UNvY89Q+DroeFK0vsUsq`^ s*lo-*(z|i(`W&Z_OpxUap00i_>zopr04}{WeEC0Zw=32y zIl_DR(F8vUvCfi%NfX~i=v)#mzU|}gdn`-;Or^4`&IH2=NsT>PQY(7dW-V%bo0hEHL@J0vD=047L>tgm zTiQjTg|rC`Atr)<7De^PoI8Vip9Qk~Skb$mM&(m28&$kI2YbOKp>hqzv**66EBruvj1l)C@*l|Om3>9rd6cQG&>wZ1 zA&gP}L78fVUi+IEhj@ZAwi5cscoySLl(}o6kB-+c=1}G?l4t_usDkk`%G@}KD!CRv zZU?zbfBk?Z&w=((#ul-Lz0hAI-v9sr M07*qoM6N<$f@MvKrvLx| diff --git a/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png deleted file mode 100644 index 18519ee5a2018af72a78ac9548e8bf5b682cdb3f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 898 zcmV-|1AY97P)230kIZH2+6;G2a~5IWuSNW?tXhbH03L&YUx&OCS&k1k6$-8D^GM ziX2g*#1TbS_?S0%6m_#v+F9f`tTJ`T0#DsUtQbQSuw2$IX`)on%lv|+S^K<5MLa|v z%VVwZAchU_JC=_+;dzWvOk+9JIXNcirilbmq9kadhe=jAcO3sA3Iig1=Ft3GQq*vj zT3+QlhgqKz!6)SqXN?Zr=w!nolERn&F4id-Lbw%Xn6pa@=feQ9*^jiKtCekJm*>21 zbh)#>B90ez+!cL}y&eL2WSo2Ps+zCmx#aCsmWvg~k2>VS4WKE;ui{Z|!LLWeqq3BDTl7q$K~WIrPRK~0Fq`5_K;c@uxRwqu5(u6VeV@d&Me&lrSRh!l zb)Ls1#gT1V%4ndpt@8m2SCZn5USl*+oC{m`R$LjjP04}LK(H!yuPd{*DHFy6Wo_MO z(7uLl|tqO=&V7sM*%NfE!|uC5#8E7k|CEQnF2n8V?k+b-%#*A=9X-GJ&QI z1k#K&31tFVe9ry4OXeri1dha*KNutGTzWZ3>Z!9eSqycH&)_V?gBfX7RPq5)|P;`llZ3DeXZ{bIXSBN2(bITTI2Ze?Y zxPxgU;{K%2qA)Ef{*ARqg#T4NJL3NIW57LlRn0dd&N2qP$2zw>-W?g|m_`$EEG&NF zF?1!7i)GPgAdc;mYLqZ;MHt~68RvZ?aYSv=g&SRbkApIL1DI!#yqT|}1I1iYk4aE%#@i?zDPo5$t{KW-_6v#0{hE@WBKp^1X YKk5muP<%41&Hw-a07*qoM6N<$g6jdMH~;_u diff --git a/src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png deleted file mode 100644 index 85c1923ed47af719f8de204f2b0007026caaa1f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 377 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXoKN!06!V;uuoF`1Youmvf*%>%;w3 z`mHw`X1Q%oeQNgZsQDdJ*_G_P#rJ@i?2f;G#W|2Yq|pM_1= zIlakeb=sMp@I432Yz&sM?RB13@le;&Va+2!{u{!gLE;q`^d|1&XFfZjij#S-;@6E| z<-E4|PWts{{{j}(6Vls~fz%6aM@}s+qZs)xxfZ`e3JfZfbw0KEJY;D|ndE4~;q#!S z>43<&`;L0e2Uz?xAbdE(po9ITs)m@#nni1+@?#h;2`F#MjmgTbDJ$_y7in2fpcBKb!G{@;>?`8pUp|m%KF7~G+2*aXxajX3u)K) zi9JhPpcypT-~z`=zVnK6SVfceGF)n^{qn*f@m%%7;CV)ioHS2w()rC6Jn>xe`o-Nd QfkDdP>FVdQ&MBb@0BMw$)c^nh diff --git a/src/main/res/drawable-xxhdpi/ic_insert_drive_file_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_insert_drive_file_black_24dp.png deleted file mode 100644 index f68c2bd7cb0538154dad0e89b66132482bd03377..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 273 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhawZg{#lhEy=Vy>yWCkb_9eLrdM2 ziV8R8zfl#9n46&REQxWN0>>-IUe-4+ZPPj){JDIfT*Bgc*xCh;I;5vP_%`86GM~be zB~8IhN-A%KI5b~QaEd8elFhZ{>clurfs!TVLPyjD9dd*iL6nLRql-eJBa4tY3MGF; z{iCC<=ACw?EDw8zERQOI=DZ1xY?3JfJB}(e^BA3g6EF5V_-j7zE0`=|qI5@rHMHe* z!L-6O5tUmV9>!HFuMH9oHCH?p6lK+ZHs?3f*TOG%d=mZV1O3S0>FVdQ&MBb@07Tkj AL;wH) diff --git a/src/main/res/drawable-xxhdpi/ic_label_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_label_black_24dp.png deleted file mode 100644 index c86bf6589d134a571d02a93faef8a2b522c447e5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmV-&0ge8NP)4m@Vb0i1#AeEh;vy`Rg+kStozGvfrXh&xpaGS<|B-kH$~GFl{BLB^h1P>*@7Amfoy ztsvuAEy!3_3(A<%3NjiDX$2WOYC$=(T0zD=HLW1y(1U*69W{Tb|IcfGq4ixsVD`#F%3#VE1(o~LV$L(oF~Qza24%;b%7vTk%IOK zlyDs(C#9-%7EY07*qoM6N<$g7$8pvj6}9 diff --git a/src/main/res/drawable-xxhdpi/ic_label_outline_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_label_outline_black_24dp.png deleted file mode 100644 index 9a16a701ce11a190e1e92b922cf7466d284d32ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 444 zcmV;t0YmXAl=6f_R5)6hsibfFLHAAM^kdm>FhP z!$8y|n&i1@nxYpGDru?~@B1$BL3L8^6^f!LilQif5U|Sw|7p{S*^MdR*rLQC8Tuke z85yWAOkhnw1sS-{3}MM0l86^rQa}=N4J+!21^s0l3&gO0@`&NB`=Bf}#Bj%T5G>L` zBHx*H9R$aSVVS^nP>LdAcq49@x m32jhhp8!Qs6h%=KKluVNPKTd@cQEd@i=gHX_eU=eBQLA@z{1pgou6|Y9nYVqbNCrf(}#V=q% z3QCDND2Srcq+cM4EtR^Pt$92RyE98N#4+0l@9(|sybBK{(1BG#h~7qyX%<!2JJ+F8juXd0KvY=ahYna?(84VP-R zK@D7jY=dxQl_0{ zYx^DAb-$pa#Kw%1Je#z#&Zx0lAa>XnzU- zw%3eVTZf3yZukf7WgYDmxzzb2^Hd24Smg<4Qs;fVLHofT{~*O}VntMk^N`pr6#hZ% z<}0x)9p%gr`$E5Oke+cOVnuQ&_t3|EViDv2@}KKvl9m{8zHxwM==?AHcfSSL;vPdS zcZZoHAn8#zt{-!l0-ke`VPj`Mmv})4?i~Lh#Z@BG>b&J8OH}wq+BVm^c|ki)l}^++ z(d`@K07bTNgJ0ZbAe$@f5VO>2r_KZRW&3Gi7iTH4N|U4}RZ5(rKl^VTdIm`v^#45N sKS@f0BuIiJNP>Jvf+R?SB&f&c4>-j2s;86O-2eap07*qoM6N<$f(C;WaR&qXcyj(G-mmc>s|_bL|NoK{OO4M0Eg>U=JNY z1gSmWHX(b!)LVZE-_Lyl*L>rg`{jnnQ|5yw_DDncoD$a9P57id_GP;SR&EMyA6g@S;J=WH48KY;W zh_JR-VUnI0C&D_~Go#3*c)&W|9sdwJ!n#@ksRiOLgJR|oDq&sk5}9R8vPDGBL_tL) zMyQE`s$>vY$7EYWpdbv|N8myjbdEqp7*s~!O&IiwKr9T35isdI$b&q{gFMKCJjjCv zEhr}r$_aARNrD`8k}yY~q|ebO>2vf+)|a*7LC)=9iQ6WSRV;BU1oD@cgq(;!1hXMN uHU+k*V~y3=B)Az)h^P~B%rwrq0q_a0vETrZtr$1}000052r@} diff --git a/src/main/res/drawable-xxhdpi/ic_phone_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_phone_black_24dp.png deleted file mode 100644 index 7c9d1b09c55f77d44877d4a354280ae5c2e1f645..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 574 zcmV-E0>S->P)!2PJ-H@rHV$L$%!{Psm^&nbmf4NDs!00GCXBW5P9(i&9mcltT_n9>4aSD3%Ow3uICgQ2 zjr=FWc(D&`CQobQ>*Xz@9Ht9Lp&X-lu|@Xg_43>xNU@I>XQUCw| diff --git a/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_repeat_black_24dp.png deleted file mode 100644 index 965a319ff923a1ed47a882a18c6d1cbc575c8617..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw=6bp~hEy=Vz2eC0VkmGpz?uKE zPG@B8>aO+!)>{(Se)Vt+%UyEIW9!5$<*RP1dPAgFhA)Y`E4tDw$X6i=B>ncE052Q=mf`JYD@<);T3K0RZ>pP{05H diff --git a/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_save_white_24dp.png deleted file mode 100644 index 3e0ce1a5f004065cb68947be0469e056e4457f28..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 391 zcmV;20eJq2P)Xo3#U&Y*@0w|JqSu;kW8`%L1_GX^wikkMku z+!nN<`{#6z$_n(rC9(4bD+|yj&iNr#+MqpM!jbj0K{JA|g)V3yf=0TarU+{5f*K+y z*9B$&4b&1r9bM2+1dVk;a}l)E1wrp9=N7a<6~#f$6D?x75&I%ZEatS z3r4ib$>}g=S;qtI3$1o(pck}Sr-AO#YLW)JV1q`lWa+;+-xWC5gj7%<=ZDH(me{XcPsMwpooP%7y+1rnLB4UlW6*K?9)>O`sq( zg%nBZ0inLJ%rpa(NZn(c=PyFT7BI;pq^5^i z!US!GtvI)aQ-l`nBg#1R9KRDk{ zQh@~Wk;(dzbtJK#%g9QflO?tfkVQ^e%zlB1$nuWqS!96`GT6v)SXPX;3EYd^cMjo# zjC6xC#!ez9D}xIePK&z7F|MFLlrKQf7tg@P)BukmoIyM5wb=jW@<4 zX0MJh;<=BrBGMA?&~Ee@@d{eK@n5dOjq7hBy(`$YYRFmOTK()GCX0D)Z4@js?7 zQ^1uDvD9y~1w$W;NE2jm;V$HMFp9AXH^rrgaY6pQyFrNk6{cr>si$yS_sf3K+&Gjsp7#kX0_>lh8eUOY~nZ zyYVpL^CAm`kvMl_p@S*HNUL*@&9tG@MmHlgh+cUfA4@r9dCPX4aR#Z;MUfmiigZz9 zkdxy0C71FloY=`tLd(|RNgS#$W)bE#M=9alb}l4}GsPBCvyF2E#!&($c#zbU8Dxg# z|BbT56wg!S4)W+_h*4(wi8{;NVv(y{mX?;k0Rs;b7_M*DL;wH)07*qo IM6N<$f@PfX0ssI2 diff --git a/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png deleted file mode 100644 index abbb9895108b56aedde011bdde5eb8ddaff78838..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 728 zcmV;}0w?{6P)18zk+dXf)UDAjLvsN|p{t6$05L%?Ktw?Z^gaZCQV^>Zx>oT5B!UZD>LPSm z|L~VCszm}4VSKu%ZO@sc>73z9GKG1U!+E|uoS*N^M5!=g!h{LqKXj94ff8p_aHw!f ziFtB#wL|6=o7_=9cWf}!N|_gY;@|neKr3V(v542)QzX`0ojyKemomN0(|N`@_Bkcf ztl6p6`NkqSGQ^1xCqtekuIebI<#is{EY>;WMC*)uR$b$Z z(g)oNPHrpSfn4QL-e6kR;0(D@Nb>GoKwwK4j`B+2oi$`B^GkO6(b* zLPzpSF^b0NX%vSUqI4L~4#ky}qMuz4Iy=7(y6gF2Q~ohxkTt4*QK_=7cV&)SqNEg^ z3^T_TC*0t0%L&`eGUC2MdD=21&+2^~xs(oqsFZHE(qX9Np|QG^_S>&?P@~inD!G)> z|AW$(_ABiNO30vw6u_#jj0000< KMNUMnLSTZewp6SD diff --git a/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png deleted file mode 100644 index 3023ff8daa925ac79e863caf679d03c56c3afc93..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 827 zcmV-B1H}A^P)>`06 zl!7Kix5q+Fq6=w?Bq2zRX%{Q=l9q~JFAfaD-fMk(ql{OMJp*hZ8Le@FKzb36b`fRvPbJZ#ihbmi`-huQ`v`H+dnnz5 zIO;AGB7BE9YM!%LJ&ic*2`mcPKpgfvmoR!03D^-c43Z$hAhR4H0ecmL8#qMtu}v3c zWQvny2hqm?F??uNd0r4z>Rub{-SwiV_KcJlc$@G(Y7OnY{oYXaZ@4M{dXjJ$v z`$eh=sKvO?Cei3I?)A;6Md`CXq2t(8SWgZw6G7n$pCQ&JiDGgU(}=YRim_lq5{{Tt>$z%L(Sw8>(002ovPDHLk FV1g%Ge~AD9 diff --git a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png deleted file mode 100644 index eabb0a2ba41bbe0e109263ee9b0d6ada40a6e792..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 843 zcmV-R1GM~!P)RPWZAHfP!)RVB2S(!`lt|Um(uYf2_cGfFjG~?QJ_SKM>Hu7Qz_%` zC^KY0j^p?%F-hrI#t?oEkx>e=^x$WZC9-20$8bAJMiyi_f!j|s$&C!#uq!e{4&*3d z*U4D<;$4cQ>yQUJNq3uf6oz@6$E?Ckd0-Y5%+4`a;aG`TuRL)UvsTrDjhJ=G6Wy3? zP%Zcjv%EY}z-*IhK|5x7d7^;XCe?zCn03h$-I#4qEm(P<#_c#+Sul>1xE*7f>{!k} z_~{|56pZ6*{0y;7>1g5}{!WmS0WF-w-(4mv4bw>oQKFMsszM7}DHGx$QauHt_cw57G zmNrf?VwFPCz(EGt%|eYrmJb-fVG|Z VF?y~eTbBR;002ovPDHLkV1i=jh>-vQ diff --git a/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_sort_white_24dp.png deleted file mode 100644 index b8ef1050ee3ef47ad8ceea9d5a74d02eeb7a4939..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 103 zcmeAS@N?(olHy`uVBq!ia0vp^9w5vJBp7O^^}Pa8OeH~n!3+##lh0ZJc?zB`jv*C{ y$r6(m{IloyqdeEOIQ*|dyK8c|twOVD2qVKDEC0Qm#d|_QCV0B~xvXHhm4Jkw3jkOBv58ipcZX370e0uipzppOJW-I2b56l z8k-5R=rgNL4BA*)fxi}Nr6b4$L2+JYlylELBLm*&>@M$l?=zgA_Z>p+3RQy^3WY+U zP{*k}LjXmo=7{;yGGwSEZX}j&7XLhb-|Tidtekg+n|hC{s0TTTI{~ zbyoO|XK}>q{7%(p`;}q-;~p#jK0Bt9z&xTz)w1Pz8o0+N|35h*MIeSbqZ*){FvQ2= z$)5dOQoL99B^TtGp`SJq#E6lgjR9s^<-$Pmb3Ckw@==|1-!j5|uH#8YdE6KsRYzxo z9!%(E^BSGcY;~v^tiPC~1ydsAIIq$9)Lv&8nd&Fn@k^Q#GRv#>3tg_PHR9OtfOV1Q zlxMJ_h}3z);BHi(R=yTdU)b%+a>`FJjFcXiWc385jkm$i~b5D zcC;>S&V^E9zcxXvv4nG>q!xXK5tmw*m~$adi@s_$p-Qt2*M}-rsdX8^HCdnA zF7UqAWfr%{jd30$rnD}rxTYwN4x7W(B?+;H(-@&dF=`Z-jBAakN@q zVS91KOCoQV?InMc2rh{7qn33WW&atJ!v)hK=V*`*#lJ}tl#D22?Gg+2DP1B#5Rz<( ze1rH#$zlWRv|>vu-^gNvn{v!L32aD89Zq=Ys$f;Jm`fS9WENfla8=SfCr1QRqDg*O-@&UGXh*A59?CyE0U?^3PPDioL_ONt~O9!XMU znWM;M-T1e0$RMWy|5|t%$2_87t&`^=4dFG5zo+&XqJemf^RuzcHg6E4;V7Qx0}gIf z*=Lb16t{??gEyHcPnjbsR5+weo_QuoqX-EJX;S_Hfrfuk>|E3-00000NkvXXu0mjf DaCeQZ diff --git a/src/main/res/drawable-xxhdpi/ic_today_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_today_black_24dp.png deleted file mode 100644 index 229f0445ba510899f10d8988469c0e96f4fe90ab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY0wn)GsXhaw_IbKEhEy=Vy=l*N$U&g>RHtJSnJqgLx9ANGao|LJ<$R=DiVX8FCM9tw?IT4i@O^1Qye zc@aZ>ag@&Ib7u;sStK%Md+vxza$H@om6zFc$F9~!s~Fo28+KOlai~miVB(yzP_Q8m zNO7jz|8`!XkwxePixAK(HkMNpfwCYaPuadYTkFakaxh(ImbgGDTzH-09A(aQZav01 rnm@E7E?-Ffb;?wgbLo_zdG|VA{CRiw=+;o6PZ&I1{an^LB{Ts5S4>~9 diff --git a/src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_visibility_off_black_24dp.png deleted file mode 100644 index 13eb65df37f34436c96b63e5e3d1edad08bd15be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 884 zcmV-)1B?8LP)FW!?-sLzGlhR8&+Y z1$x88`2T z;2#2hNQxqDT(Jo&$dPow7vyQDo;X!BkY$QB$^xmxDB8tXbQo2p4{LFpN-@u|fO-k7 zDp*CKTu4%B3Igd(Vt6cWa(s{=&zURfbv(9=LIpw^5J)c|M_%CQktT&nk08{6fzl_@ z#4fw6(1k7GES=JVOG*BaG0r4zVjqR#Yi`C`TDaqOsNvGy7Z4j5$fOfGv9=&gT>|Is z6E+&$K+Yqn8MBn|s5~cwLkWHsKwkoQByD4DU6}k04o#qh^*Csdx-pv;XXmh0g?yav z01eVAW*y?}Ux_Uk*D{7weOI(#4$6lA9y>-3aUn)z6sX0k+)P~ zRzeA+8!<~DPu~J-gUDMNF#8oHku)z^KUhn!CvM4Nwu;gq-Kl@5VMN?Cg;_UBgY=X* zdkE~s`BB)khP7=C(uOekTVgnL7Z<{R;S^@goOmQ9I1=7Pvf$iX!Y`S}TBlc%@P_gl zmsU&B6?9A*Yt4M+o3u*}E@ddWk_y=CVud1qQ(^~0n{-MmLSw>Z%X4`-ZPGBvz3K`& zV<0fni+C!=I|6Ak5YiiXF3x)>;Vh*+lltu>-4{iG7_SJVV-`r^R1;e$f%LNfj}1<% z%sSI_&`322(%j7qo1CLiuB1AySUbO={4bN_za;O5jRg0y6E;!>V;qEw1eJ{NL%2u) zZ7gx9@iBOr3=ebWn + + + diff --git a/src/main/res/drawable/ic_add_black_24dp.png b/src/main/res/drawable/ic_add_black_24dp.png deleted file mode 100644 index 23bf119211e02b139ad2e0961bc71662ce1caf1e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 86 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Sx* + + + diff --git a/src/main/res/drawable/ic_arrow_back_black_24dp.png b/src/main/res/drawable/ic_arrow_back_black_24dp.png deleted file mode 100644 index ad3883098aaa63b11702388bd58e0280a4e56e8a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 114 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1OHUWakP60RiDL^GIXr{@&3|a# zES7o7*&|raEBI;R5{>`PlZt94B=K^nw>~a9bmGDy*ICncJ)B+6c;%K;px=~btUyB; NJYD@<);T3K0RZi>C3pY; diff --git a/src/main/res/drawable/ic_arrow_back_white_24dp.png b/src/main/res/drawable/ic_arrow_back_white_24dp.png deleted file mode 100644 index d571552fb9c5a5e47b5494f52a5cfab771d5435b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1TTd6q5R22v2@=~L)F1xOc4^B0 z|NnpQ7t1{5>=7*I75p@DiN=5DSw%JtMZ5*-t&^n^4|{iuWk$Vf%YVkoprJSQ@Ah{} Rw}A#Rc)I$ztaD0e0sv~HDc}GA diff --git a/src/main/res/drawable/ic_attach_money_24dp.xml b/src/main/res/drawable/ic_attach_money_24dp.xml new file mode 100644 index 000000000..ae6b67749 --- /dev/null +++ b/src/main/res/drawable/ic_attach_money_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_attach_money_black_24dp.png b/src/main/res/drawable/ic_attach_money_black_24dp.png deleted file mode 100644 index 2ae5e6d14d68cab1bbde713479df2e2bb9a69888..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmV06)lO_)xo${+$uT{HvlF@%qiFruVz)7 z@*%_qI(hX=*Wx;qc&Z57xAG{X++~%e418m!kgGua3W3ta3}T^tck8I9gNu% tu~Ku5Ur)LsT0N~g7ZF!B`rN~y_y_Z)Pv5W|DYXCq002ovPDHLkV1lJPV>JK( diff --git a/src/main/res/drawable/ic_attachment_24dp.xml b/src/main/res/drawable/ic_attachment_24dp.xml new file mode 100644 index 000000000..115de53d8 --- /dev/null +++ b/src/main/res/drawable/ic_attachment_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_attachment_black_24dp.png b/src/main/res/drawable/ic_attachment_black_24dp.png deleted file mode 100644 index ab5bb74899183f9b13e5ba1178da9c817b5108e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iHJ&bxAr*{oFK+ZYlqkab;eK+5 z0PoC4n_b?E1nTDQ6yv+5_m!vBW4$2fU)4kBW1OVzb~N8Ty727%nfh}Mf8GCWS6iA{ z=CpZVSS_}0GAMedbF%l?^nDk$8eN^#%-rjqn6Z$x&v(ssu25#z8Imj2>|*jny?{oB z*sn|FJKNh@{(Y5r?`r$S?9c4JwphDLm)LakPE1k9<)8H3sq%i6 d^CsuLxJOy?i)qeht$^-k@O1TaS?83{1OOSuUYY;^ diff --git a/src/main/res/drawable/ic_attachment_white_24dp.png b/src/main/res/drawable/ic_attachment_white_24dp.png deleted file mode 100644 index de912d58959460493d5406e8f49d4190825339eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iJ)SO(Ar`%FCmM1cau9L(E}_)X zYWOJfh;`?R-np4mMK0RCkes3r=gc!hVbT$kN$C??eM>}j-+bCOli&Ey&ou&~|5=2k zmK$_*;Z^L*AI)J$~ltL zxnD9#DzAL!vvumMmK|9(8>eKsA9(UKqk96ktZ0Nlu(%Tk&$jdC42F3J^;p=<`6{1y tznCbn`O@FRyFI!s-F;>2ZbU0qGMwJ?If5rw=N!-<44$rjF6*2Ung9rBTnPXG diff --git a/src/main/res/drawable/ic_cancel_24dp.xml b/src/main/res/drawable/ic_cancel_24dp.xml new file mode 100644 index 000000000..1a1352f61 --- /dev/null +++ b/src/main/res/drawable/ic_cancel_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_cancel_black_24dp.png b/src/main/res/drawable/ic_cancel_black_24dp.png deleted file mode 100644 index f19848466978650969d74f5c68b55dc680bd56f6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 zcmV+;0o?wHP)esOvhhW%7f}0O8dAi$Idp6Zk3bGc95* zB>)|%=r6!TyCveFVWI;(ebHY@+U*dLtRy_(k*=H&H!=!69;7Q=s|V^1ojt%-QuofB z91(k?C-nK+Z4oOCL(%p51nm|G$E6IvnGAm1Z+S;rK+MSxGG)MKRR6%xjGVmFP-Vv1 p$dM@{v@F?i;(E`KEel$n%s=$T3_n~l>pK7d002ovPDHLkV1kVceYF4p diff --git a/src/main/res/drawable/ic_cancel_white_24dp.png b/src/main/res/drawable/ic_cancel_white_24dp.png deleted file mode 100644 index 787e2593789b2a0a386fd1bdfa0db8211b5366fc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 304 zcmV-00nh%4P)VsEw zh5v?Iy z0~3~rnm~0|8lDJ@5OWiDh?a`Lkmf%AOpDl<5HVVYH^s)q!GsGr%}ud!aV8Lo&;|B7 zIx4Aqh1M5)tF%SfsV%&BP51@MjqOc{tsVma0000 + + + diff --git a/src/main/res/drawable/ic_close_24dp.xml b/src/main/res/drawable/ic_close_24dp.xml new file mode 100644 index 000000000..4ee27e28a --- /dev/null +++ b/src/main/res/drawable/ic_close_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_close_black_24dp.png b/src/main/res/drawable/ic_close_black_24dp.png deleted file mode 100644 index 40a1a84e34f4fb9c31b1dccf1b2bd7f5a50ac00d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 164 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iY)==*kP619lQs%6EAp^x=L~Fl z``+Hk)n=Dm!pL5PtJwWQDwD%^7mKX72vfc*YT)xac;A{}-v*=ps zr9JO5s)Jrvt$1~wJ<6?Hv?}9?*Yy)i*G<&jSt@L~vF4xM{qD^_8RvC6y^4F&G81Sm NgQu&X%Q~loCIAp8KMVi> diff --git a/src/main/res/drawable/ic_close_white_24dp.png b/src/main/res/drawable/ic_close_white_24dp.png deleted file mode 100644 index af7f8288da6854204dcc4e6678b9053cd72032c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iGEW!B5R21KC-3Avpdi4K$<+1X zay^SH!@6{thMdKZi+L1hS^BMZUAdKCT}(HRw{NeWg~AlBHtr3jj>2B5kK^|J))MUC zlz7ydwCsb8xn}W?^r?}5wtsjdmvX{3=JbT!J9sKPrYmk={m|7^>A|Z*7j^D$`>}ry Zqi^Z9GQN4ct^!@a;OXk;vd$@?2>?I&LQeny diff --git a/src/main/res/drawable/ic_cloud_queue_24dp.xml b/src/main/res/drawable/ic_cloud_queue_24dp.xml new file mode 100644 index 000000000..1ee8bbe43 --- /dev/null +++ b/src/main/res/drawable/ic_cloud_queue_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_cloud_queue_black_24dp.png b/src/main/res/drawable/ic_cloud_queue_black_24dp.png deleted file mode 100644 index ba74612d9b6e9e9365205492b99e1086e646e9ef..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmV+y0qFjTP)b+;oGBaiJ~nJzJzOI90(n|hVAGG`$iPi zyc!6HMjZ)FhOKD`A+*dJwV)+z0^XsAg1?Oyosqyp50hLZ6v#BZ1IPpFut;s@+eb;V1!T_gYi002ovPDHLkV1ivJc!U4| diff --git a/src/main/res/drawable/ic_delete_24dp.xml b/src/main/res/drawable/ic_delete_24dp.xml new file mode 100644 index 000000000..7d4a324bc --- /dev/null +++ b/src/main/res/drawable/ic_delete_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_delete_white_24dp.png b/src/main/res/drawable/ic_delete_white_24dp.png deleted file mode 100644 index e2f5f35558db0965392b15b5d8950261a8c92aab..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 115 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1D^C~45R22v2@-!E>_7CM{eR+v zgY~R6ULP4=Whfl~yJVLAs>BdxJ>K;jR@FB~H~;@Xea5N(zxh7d@H058PdfN2J>(P6 O6b4UMKbLh*2~7YiM=IO^ diff --git a/src/main/res/drawable/ic_event_24dp.xml b/src/main/res/drawable/ic_event_24dp.xml new file mode 100644 index 000000000..e3d306ab7 --- /dev/null +++ b/src/main/res/drawable/ic_event_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_event_black_24dp.png b/src/main/res/drawable/ic_event_black_24dp.png deleted file mode 100644 index c47f2812da986b8cacb31d7e20b0d464eabc81d7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 127 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1H%}MGkP61+1w4P)o!%r($>vC@ z;GA-RH{S5a;uY+g>J0IVB7G$ITG(t7GO`>h%6?=lsNb+pX~v|u1z8*k6`l?|^$#bo ZGFa6dJ8rq6o(E_mgQu&X%Q~loCIDl{Ch-6O diff --git a/src/main/res/drawable/ic_event_note_24dp.xml b/src/main/res/drawable/ic_event_note_24dp.xml new file mode 100644 index 000000000..614f4a769 --- /dev/null +++ b/src/main/res/drawable/ic_event_note_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_event_note_black_24dp.png b/src/main/res/drawable/ic_event_note_black_24dp.png deleted file mode 100644 index 2566a75d6b4bab9b78ba18d79ebb69126534daed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 132 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1Z%-G;kP61L{Tq239C(iGQDFKO z-|$DsT~_gFS3}cX*TTXt0;}?SAE*R8Oi~v-A))eQE{E1V?k`*9d-8rLo# + + + diff --git a/src/main/res/drawable/ic_filter_list_black_24dp.png b/src/main/res/drawable/ic_filter_list_black_24dp.png deleted file mode 100644 index d86492b42df06096c171dc7b2cb2a893de183fb2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 89 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*11y2{pkP60R1;(DH|1F9qrP{V# m*Sun|#l~NmcSeE;1A|e9^WOQ_&q)E*GI+ZBxvX + + + diff --git a/src/main/res/drawable/ic_flag_black_24dp.png b/src/main/res/drawable/ic_flag_black_24dp.png deleted file mode 100644 index 44ad605adf13b1ee3e53ec58d66d21063027899a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 99 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1El(H6kP60RiL?jyY*SQ1o6Q+{ we<;M7_GCFQ*aw+ + + + diff --git a/src/main/res/drawable/ic_folder_black_24dp.png b/src/main/res/drawable/ic_folder_black_24dp.png deleted file mode 100644 index 6e6b8705ead128eaba9869e2e8f1211a49182f45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 118 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1TTd6qkP60R2{VNW4^tK4vK zuywK2jQS_c7;pGvah3v4{G?S6|4+DXu + + + diff --git a/src/main/res/drawable/ic_help_black_24dp.png b/src/main/res/drawable/ic_help_black_24dp.png deleted file mode 100644 index f6e789ba1f23834205fcc6fedcca4c8a69faafb6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 298 zcmV+_0oDGAP)4m5vzP&kJVR$_+YO{YNJ^r(?<8#tgzli|B|1a2QwEJFm$lIXgBE=-GfX?5 zcQf + + + diff --git a/src/main/res/drawable/ic_history_black_24dp.png b/src/main/res/drawable/ic_history_black_24dp.png deleted file mode 100644 index e77a077ae673bbdfac056d67189feb0c9e25e426..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 311 zcmV-70m%M|P) + + + diff --git a/src/main/res/drawable/ic_inbox_black_24dp.png b/src/main/res/drawable/ic_inbox_black_24dp.png deleted file mode 100644 index 0129706c1a5a2c109806608e3f1e5f81fb7e26ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 169 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+i0#6smkP61L7dP@c8HzYxv}XKs zRG`V!;S^W?o%uctLX$E(9+(=scEwy@ZuGir>B56j=|Q41LxUb2)mXUFVZJUC(_bAO z50wKAE=)WgD$D+VxZ8NI?U&mFxAlM6 + + + diff --git a/src/main/res/drawable/ic_insert_drive_file_black_24dp.png b/src/main/res/drawable/ic_insert_drive_file_black_24dp.png deleted file mode 100644 index fe876672aef5df5f125cc288b1aa39139defcdd8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 131 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7~ThPZ!6K3dZCG${Z;bCqKyZnmxGO zu<{RMo$i0b1xzm7AEhJ`qB^cMTyWaL)*_Zj1m^rnW%d^&hnA8+E()9a?;6 ddSe~~L%E=|$NOmxRX|f2JYD@<);T3K0RWmRD-{3$ diff --git a/src/main/res/drawable/ic_label_24dp.xml b/src/main/res/drawable/ic_label_24dp.xml new file mode 100644 index 000000000..07164af55 --- /dev/null +++ b/src/main/res/drawable/ic_label_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_label_black_24dp.png b/src/main/res/drawable/ic_label_black_24dp.png deleted file mode 100644 index 119dc210518a32b7fe9fc76c07cbfea7f4e20642..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iTu&FrkP60RiIWNw9;zO$U-LmU zfKRw#%Hx)Ji4a56KgYTK4L2lYC@@5OT>UWppqMYS9aD};y_@`Oi9L_m zlFD5(w + + diff --git a/src/main/res/drawable/ic_label_outline_black_24dp.png b/src/main/res/drawable/ic_label_outline_black_24dp.png deleted file mode 100644 index 1d600c2161f3fbb6f46c0bfa5388f25f33a28883..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 186 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iMo$;VkP6196Ak&A90XkB9rw2z z+;i${;7kwdI~2<^eZnz`%&jc@t-m@LMMr#$+r9qA&o?utiAR+#I=cDioj(Of7QV5v zOf<#h#vY?8{+<}SvI{|#RVln0$$p6-{LzIO_5`RBvF8JEr3Wzyx& k%;0_|9(+@sxB5AIPh861rR91*fR17CboFyt=akR{0J0=Vr2qf` diff --git a/src/main/res/drawable/ic_menu_24dp.xml b/src/main/res/drawable/ic_menu_24dp.xml new file mode 100644 index 000000000..89198a3f9 --- /dev/null +++ b/src/main/res/drawable/ic_menu_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_menu_white_24dp.png b/src/main/res/drawable/ic_menu_white_24dp.png deleted file mode 100644 index d3cec05646ba9db5b07edf68e5ac42ebf0d2660a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 83 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1DNh&25R22v2@&Hr5(PMP#n fRb9Efn1O>KFzdSJ6Ga<8pehDWS3j3^P6o^sE diff --git a/src/main/res/drawable/ic_mic_24dp.xml b/src/main/res/drawable/ic_mic_24dp.xml new file mode 100644 index 000000000..ac5e85609 --- /dev/null +++ b/src/main/res/drawable/ic_mic_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_mic_white_24dp.png b/src/main/res/drawable/ic_mic_white_24dp.png deleted file mode 100644 index 87319a6cc14d49f09a81633d7a4de810175f5d3b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 245 zcmV+ZZ4WbbV^Ie7c6FjWs=h`9Dr2mjn# z5hDN>V%4LYIyl9V=o^}Oa%oK*?O~r00000NkvXXu0mjf65(JY diff --git a/src/main/res/drawable/ic_notifications_24dp.xml b/src/main/res/drawable/ic_notifications_24dp.xml new file mode 100644 index 000000000..452854311 --- /dev/null +++ b/src/main/res/drawable/ic_notifications_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_notifications_black_24dp.png b/src/main/res/drawable/ic_notifications_black_24dp.png deleted file mode 100644 index 8cd28c8b407e8c36c17acadd452590df870927af..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 175 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+iGEW!BkP61Trw?*688WzBtUr;u zI%tdJ#x4wRxM<0Wg}27wRT28W|F6Cf=j+E zM}_?7>qny&uh%v3dsc8{$IQc`%Cnu1O?aEnFL*QQ{GFJPx6`++*s}2Afz~548zXHP YrMwSM5&zxv7w7^8Pgg&ebxsLQ01DVXdjJ3c diff --git a/src/main/res/drawable/ic_phone_black_24dp.png b/src/main/res/drawable/ic_phone_black_24dp.png deleted file mode 100644 index 55ed026bcec5bba38bcf91972fd08d4671dc9b84..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmVM;L^lw`#y_Big-bALY&7E&hT#K| z8D5!l>tAs#u6t4M+fd4nXf~EIE5V7B=Mqe$oQv{eMZ%~AkCr5CG`FAhC0z?|`qFlU zX+EImR=AL7%cn4sXJ44xRamyF)3{C!^}xW3xjUzh4cnd^3E|S3fmc!XrPW^jW#(P{ uS%*zG;@@=JcBM)N#kvD$9(<@wEUI4=uVbN7%%kf70000 + + + diff --git a/src/main/res/drawable/ic_repeat_black_24dp.png b/src/main/res/drawable/ic_repeat_black_24dp.png deleted file mode 100644 index c00a24ebfc314fde45d92335916a8bd2c31886cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 122 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1M^6{WkP61L=Pz zwXg=uyTd>JE+|^0uv&Gl$Mw_d3)Fl4r3C~YIOJu?aF{AwX}Iv!W=4mWNTkID=INF3 VE7uk_ZvYy`;OXk;vd$@?2>^)PDIov= diff --git a/src/main/res/drawable/ic_save_24dp.xml b/src/main/res/drawable/ic_save_24dp.xml new file mode 100644 index 000000000..c26fb3328 --- /dev/null +++ b/src/main/res/drawable/ic_save_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_save_white_24dp.png b/src/main/res/drawable/ic_save_white_24dp.png deleted file mode 100644 index 015062ed3b316909362e3bfe43579715a4f2c14e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_+id`}n05R2ZcmmRqp6hvGD%@cNQ zTrf?MD{tY`DCrY!+h+!7)MX@<|M>91UCT6U&6_Q^vKIW^bNn|gNPwG~q2dAY{6@(2Ul)|NDzIgd>D5-Nv3R_&pT)_9!>hC0v RLqMw;JYD@<);T3K0RZw0JMaJi diff --git a/src/main/res/drawable/ic_schedule_24dp.xml b/src/main/res/drawable/ic_schedule_24dp.xml new file mode 100644 index 000000000..ad969d6d6 --- /dev/null +++ b/src/main/res/drawable/ic_schedule_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_schedule_black_24dp.png b/src/main/res/drawable/ic_schedule_black_24dp.png deleted file mode 100644 index 8423cf4ce8b934dfcc32b3bca762761b7ab16d5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 345 zcmV-f0jBf(RCXqGBLPRkT(%H4MuRQk zLbeo|(V!LX#)GdO4F-AACS*_i@XtFB0NcX3?6WYlYTYZ>{(1>cgj3lIp;swA^u;Gs zz6%ps>q_VhS;Mig(8$;qZtNQJ*sbtP;X_KgVp!!ky}wmbrzG@_Y-zQ&ouuvIjoP4n rSE9Iur$)4<<}Td1b?(%2Ywp>9Po#6}`=r0g00000NkvXXu0mjfb!48W diff --git a/src/main/res/drawable/ic_search_24dp.xml b/src/main/res/drawable/ic_search_24dp.xml new file mode 100644 index 000000000..173d7cc2f --- /dev/null +++ b/src/main/res/drawable/ic_search_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_search_white_24dp.png b/src/main/res/drawable/ic_search_white_24dp.png deleted file mode 100644 index faefc59c8e574774fda7a43bcb2214bd109eaa1c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 247 zcmVO-uP3I_MS + + + diff --git a/src/main/res/drawable/ic_settings_black_24dp.png b/src/main/res/drawable/ic_settings_black_24dp.png deleted file mode 100644 index c59419c02b6273e09063a0529d2239784818207f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmV-I0lof-P)J%}fHzV<>iUk{yCv=|P(yFM9CIKrv6;vdj!^e)OQ=oM~3L z3Hov zYMc*TMS6^4Y*s#v8YK}AT(ig&XB4{J=afm7xZ$2C{CQWp)PoCx)G7YcXPY7T1DnU) UWG_v5V*mgE07*qoM6N<$f<$+V!T>O6 zS70QgNAU8v+(?*#6#o9*V@~mgC;x#Rf^DRK!rxsIH1Y+{1W$v50*~CV#54`Q2vW|N zVwqbWh7Wvdgwql&RGT?0V4Y7)9ZgCcW4f$baDbN(6Vt-m zvtW!jvUC`+K-kE98fAa!h + + + diff --git a/src/main/res/drawable/ic_sort_24dp.xml b/src/main/res/drawable/ic_sort_24dp.xml new file mode 100644 index 000000000..3735be4cb --- /dev/null +++ b/src/main/res/drawable/ic_sort_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_sort_white_24dp.png b/src/main/res/drawable/ic_sort_white_24dp.png deleted file mode 100644 index 3d84a444276398d82b2b205f9637f4a5c4ce395b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 90 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1MNb#U5R22v2@&Hr5(PMPp1 m`Um?TR`_m`YtqBChk>Dge}Ca(gVG$JVg^rFKbLh*2~7ZY(iejO diff --git a/src/main/res/drawable/ic_timer_24dp.xml b/src/main/res/drawable/ic_timer_24dp.xml new file mode 100644 index 000000000..fa9420593 --- /dev/null +++ b/src/main/res/drawable/ic_timer_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_timer_black_24dp.png b/src/main/res/drawable/ic_timer_black_24dp.png deleted file mode 100644 index 15d3151148ba79fa1023c5dfbc3f890b8406e65f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmV-C0mJ@@P)GXwOYg=9AO%H zUuLuj_?-6tJI+V^x$}eb6~-z%C%=4Ec?lkPq)}-tviso1X9o|-J@rG_n<#a3T$(zl zGoRd-DeHNq2LSq(LU=4wSPPW`5CTxt$vc^`u-79GFmNk8lc$nJZmg*XHi(`HdDA-iz#3hW_fgSH3tp+E^I*?|uVo0DuRN3z`f7 O0000 + + + diff --git a/src/main/res/drawable/ic_today_black_24dp.png b/src/main/res/drawable/ic_today_black_24dp.png deleted file mode 100644 index 227bfca964bde6e819b7db6709cc1c2af04c1a96..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 128 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM0wlfaz7_*1cTX3`kP61+1w4P)o!%r($>vC@ z;GA-RH{S5a;uY+g>J0IVB7G$ITG(tFs-y(?Bpjs#5;(FdTn$wBI$RYv@L^IzQGDA$ aE`~jA$Br-UFyaIn$>8bg=d#Wzp$PyOHzi*H diff --git a/src/main/res/drawable/ic_visibility_off_24dp.xml b/src/main/res/drawable/ic_visibility_off_24dp.xml new file mode 100644 index 000000000..59a614550 --- /dev/null +++ b/src/main/res/drawable/ic_visibility_off_24dp.xml @@ -0,0 +1,6 @@ + + + + diff --git a/src/main/res/drawable/ic_visibility_off_black_24dp.png b/src/main/res/drawable/ic_visibility_off_black_24dp.png deleted file mode 100644 index 3efdf49225d2972404b12050e99673e85e1edf91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 351 zcmV-l0igbgP)hSqc>diP4$sW^U%BO-%KmsS`H+(X*WB~K#9deQbW&MH@=6l3F>|bg zT9cE)snpumquooFttH7vm7Wu&Lw)mzRxS!S@2ez5A{d8X3(uR-KXX!eZmPstJbNK? zTZ#=ek-YT;11WX`_#%{2Wh-g^Bs0`fYz3@^a)=*NPR`+IHy8?~kEc>3?N_=k^E%WV zrKycyIqAjEeJMB+-(d`>G_B;b3c)3xA~`cqtKAV-JamCJ2Oir>9b2mC=GZeENz8ZO x{+>`cF>>F;$Q6a!GLrqs$pZFI7H;}S{050TyiMlgk#hh5002ovPDHLkV1g{Sls*6e diff --git a/src/main/res/layout/alarm_edit_row.xml b/src/main/res/layout/alarm_edit_row.xml index 42ed679c7..cbe52c594 100644 --- a/src/main/res/layout/alarm_edit_row.xml +++ b/src/main/res/layout/alarm_edit_row.xml @@ -29,7 +29,8 @@ + android:tint="@android:color/white" + android:src="@drawable/ic_close_24dp"/> @@ -97,7 +98,8 @@ android:padding="4dip" android:background="@android:color/transparent" android:scaleType="fitCenter" - android:src="@drawable/ic_settings_white_24dp"/> + android:tint="@android:color/white" + android:src="@drawable/ic_settings_24dp"/> diff --git a/src/main/res/layout/astrid_calendar_reminder_view.xml b/src/main/res/layout/astrid_calendar_reminder_view.xml index 6acf35497..a3a1f52fe 100644 --- a/src/main/res/layout/astrid_calendar_reminder_view.xml +++ b/src/main/res/layout/astrid_calendar_reminder_view.xml @@ -36,7 +36,8 @@ android:layout_width="25dip" android:layout_height="25dip" android:scaleType="fitCenter" - android:src="@drawable/ic_close_white_24dp"/> + android:tint="@android:color/white" + android:src="@drawable/ic_close_24dp"/> @@ -97,7 +98,8 @@ android:padding="4dip" android:background="@android:color/transparent" android:scaleType="fitCenter" - android:src="@drawable/ic_settings_white_24dp"/> + android:tint="@android:color/white" + android:src="@drawable/ic_settings_24dp"/> diff --git a/src/main/res/layout/astrid_record_audio_view.xml b/src/main/res/layout/astrid_record_audio_view.xml index f0c08d222..d0207dbce 100644 --- a/src/main/res/layout/astrid_record_audio_view.xml +++ b/src/main/res/layout/astrid_record_audio_view.xml @@ -36,7 +36,8 @@ android:layout_width="25dip" android:layout_height="25dip" android:scaleType="fitCenter" - android:src="@drawable/ic_close_white_24dp"/> + android:tint="@android:color/white" + android:src="@drawable/ic_close_24dp"/> diff --git a/src/main/res/layout/control_set_deadline.xml b/src/main/res/layout/control_set_deadline.xml index e506e2dfc..1fb12fc24 100644 --- a/src/main/res/layout/control_set_deadline.xml +++ b/src/main/res/layout/control_set_deadline.xml @@ -41,7 +41,8 @@ android:paddingLeft="10dp" android:paddingRight="10dp" android:paddingStart="10dp" - android:src="?attr/ic_cancel" + android:src="@drawable/ic_cancel_24dp" + android:tint="?attr/icon_tint" android:visibility="gone" /> diff --git a/src/main/res/layout/control_set_template.xml b/src/main/res/layout/control_set_template.xml index fe739cccd..2c8853bd4 100644 --- a/src/main/res/layout/control_set_template.xml +++ b/src/main/res/layout/control_set_template.xml @@ -9,6 +9,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="top" + android:tint="?attr/icon_tint" android:alpha="@dimen/drawer_icon_alpha" android:paddingTop="@dimen/task_edit_drawable_padding_top_bottom" android:paddingBottom="@dimen/task_edit_drawable_padding_top_bottom" diff --git a/src/main/res/layout/file_row.xml b/src/main/res/layout/file_row.xml index ada9a522f..2962dd76a 100644 --- a/src/main/res/layout/file_row.xml +++ b/src/main/res/layout/file_row.xml @@ -41,7 +41,8 @@ android:id="@+id/remove_file" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="?attr/ic_action_cancel" + android:tint="?attr/icon_tint" + android:src="@drawable/ic_close_24dp" android:layout_marginLeft="-5dip" android:layout_marginRight="5dip" android:visibility="gone" /> diff --git a/src/main/res/layout/filter_adapter_row.xml b/src/main/res/layout/filter_adapter_row.xml index eae67a064..e1dafc90e 100644 --- a/src/main/res/layout/filter_adapter_row.xml +++ b/src/main/res/layout/filter_adapter_row.xml @@ -34,6 +34,7 @@ android:id="@+id/icon" android:layout_width="56dp" android:layout_height="wrap_content" + android:tint="?attr/icon_tint" android:alpha="@dimen/drawer_icon_alpha" android:scaleType="fitStart" /> diff --git a/src/main/res/layout/tag_edit_row.xml b/src/main/res/layout/tag_edit_row.xml index 2ab062fb5..304be7110 100644 --- a/src/main/res/layout/tag_edit_row.xml +++ b/src/main/res/layout/tag_edit_row.xml @@ -30,7 +30,8 @@ diff --git a/src/main/res/layout/task_list_activity.xml b/src/main/res/layout/task_list_activity.xml index 0dfbb4829..4f0e5d72b 100644 --- a/src/main/res/layout/task_list_activity.xml +++ b/src/main/res/layout/task_list_activity.xml @@ -24,7 +24,8 @@ \ No newline at end of file diff --git a/src/main/res/menu/tag_settings_activity.xml b/src/main/res/menu/tag_settings_activity.xml index d8277913f..5d37d3872 100644 --- a/src/main/res/menu/tag_settings_activity.xml +++ b/src/main/res/menu/tag_settings_activity.xml @@ -5,13 +5,13 @@ \ No newline at end of file diff --git a/src/main/res/menu/task_edit_fragment.xml b/src/main/res/menu/task_edit_fragment.xml index ee423ea9c..c61fff89f 100644 --- a/src/main/res/menu/task_edit_fragment.xml +++ b/src/main/res/menu/task_edit_fragment.xml @@ -5,18 +5,18 @@ diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index d6bba5e47..18b47272d 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -23,14 +23,13 @@ - + - + - diff --git a/src/main/res/values/styles_dark.xml b/src/main/res/values/styles_dark.xml index 2a4d372f3..7ce20e85b 100644 --- a/src/main/res/values/styles_dark.xml +++ b/src/main/res/values/styles_dark.xml @@ -23,10 +23,10 @@ @android:color/darker_gray @android:color/black @android:color/black + @android:color/white @color/task_edit_divider_dark - @drawable/ic_close_white_24dp #c3c3c3 - @drawable/ic_add_black_24dp + @android:color/black @null true @@ -41,7 +41,6 @@ @drawable/importance_background_selected @drawable/textfield_underline_white @style/SpinnerNoPadding - @drawable/ic_cancel_white_24dp