diff --git a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index d3deb6e04..846b5c86a 100644 --- a/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -25,6 +25,7 @@ import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.api.FilterListItem; import org.tasks.R; +import org.tasks.activities.DonationActivity; import org.tasks.filters.FilterCounter; import org.tasks.filters.FilterProvider; import org.tasks.filters.NavigationDrawerAction; @@ -258,6 +259,11 @@ public class FilterAdapter extends ArrayAdapter { getResource(activity, R.attr.ic_action_help), new Intent(activity, HelpAndFeedbackActivity.class), 0)); + add(new NavigationDrawerAction( + activity.getResources().getString(R.string.TLA_menu_donate), + getResource(activity, R.attr.ic_action_donate), + new Intent(activity, DonationActivity.class), + 0)); } notifyDataSetChanged(); diff --git a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java b/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java index 886f585a1..ad6e95f2d 100644 --- a/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java @@ -64,13 +64,19 @@ public final class BuiltInFilterExposer { List filters = new ArrayList<>(); if (preferences.getBoolean(R.string.p_show_today_filter, true)) { - filters.add(getTodayFilter(r)); + Filter todayFilter = getTodayFilter(r); + todayFilter.icon = resourceResolver.getResource(R.attr.ic_action_calendar_today); + filters.add(todayFilter); } if (preferences.getBoolean(R.string.p_show_recently_modified_filter, true)) { - filters.add(getRecentlyModifiedFilter(r)); + Filter recentlyModifiedFilter = getRecentlyModifiedFilter(r); + recentlyModifiedFilter.icon = resourceResolver.getResource(R.attr.ic_action_history); + filters.add(recentlyModifiedFilter); } if (preferences.getBoolean(R.string.p_show_not_in_list_filter, true)) { - filters.add(getUncategorizedFilter(r)); + Filter uncategorizedFilter = getUncategorizedFilter(r); + uncategorizedFilter.icon = resourceResolver.getResource(R.attr.ic_action_uncategorized); + filters.add(uncategorizedFilter); } // transmit filter list return filters; diff --git a/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java index e83d16bf5..183f912c5 100644 --- a/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java @@ -27,6 +27,7 @@ import com.todoroo.astrid.data.Task; import org.tasks.R; import org.tasks.injection.ForApplication; +import org.tasks.preferences.ResourceResolver; import java.util.ArrayList; import java.util.List; @@ -44,10 +45,12 @@ public class TagFilterExposer { public static final String TAG = "tag"; //$NON-NLS-1$ private final TagService tagService; + private ResourceResolver resourceResolver; private final Context context; @Inject - public TagFilterExposer(@ForApplication Context context, TagService tagService) { + public TagFilterExposer(ResourceResolver resourceResolver, @ForApplication Context context, TagService tagService) { + this.resourceResolver = resourceResolver; this.context = context; this.tagService = tagService; } @@ -111,9 +114,12 @@ public class TagFilterExposer { List filters = new ArrayList<>(); + int label = resourceResolver.getResource(R.attr.ic_action_label); + for (TagData tag : tags) { Filter f = constructFilter(context, tag); if (f != null) { + f.icon = label; filters.add(f); } } diff --git a/src/main/java/org/tasks/filters/NavigationDrawerAction.java b/src/main/java/org/tasks/filters/NavigationDrawerAction.java index 0386a4d45..9958abbe1 100644 --- a/src/main/java/org/tasks/filters/NavigationDrawerAction.java +++ b/src/main/java/org/tasks/filters/NavigationDrawerAction.java @@ -67,19 +67,4 @@ public class NavigationDrawerAction extends FilterListItem { return new NavigationDrawerAction[size]; } }; - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; - - NavigationDrawerAction that = (NavigationDrawerAction) o; - - return requestCode == that.requestCode; - } - - @Override - public int hashCode() { - return requestCode; - } } diff --git a/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java b/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java index 8b892d2bb..99467d1e3 100644 --- a/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java +++ b/src/main/java/org/tasks/preferences/HelpAndFeedbackActivity.java @@ -24,9 +24,6 @@ public class HelpAndFeedbackActivity extends InjectingPreferenceActivity { putExtra(Intent.EXTRA_SUBJECT, "Tasks Feedback"); putExtra(Intent.EXTRA_TEXT, deviceInfo.getDebugInfo()); }}); - if (!deviceInfo.supportsBilling()) { - remove(R.string.TLA_menu_donate); - } if (!deviceInfo.isPlayStoreAvailable()) { remove(R.string.rate_tasks); } diff --git a/src/main/res/drawable-hdpi/ic_action_gear.png b/src/main/res/drawable-hdpi/ic_action_gear.png deleted file mode 100644 index 0c114ed1f..000000000 Binary files a/src/main/res/drawable-hdpi/ic_action_gear.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_action_gear_white.png b/src/main/res/drawable-hdpi/ic_action_gear_white.png deleted file mode 100644 index 34a8a95c5..000000000 Binary files a/src/main/res/drawable-hdpi/ic_action_gear_white.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_action_help.png b/src/main/res/drawable-hdpi/ic_action_help.png deleted file mode 100644 index 7eec86b70..000000000 Binary files a/src/main/res/drawable-hdpi/ic_action_help.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_action_help_white.png b/src/main/res/drawable-hdpi/ic_action_help_white.png deleted file mode 100644 index a88801f87..000000000 Binary files a/src/main/res/drawable-hdpi/ic_action_help_white.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_action_inbox.png b/src/main/res/drawable-hdpi/ic_action_inbox.png deleted file mode 100644 index 68dadd12e..000000000 Binary files a/src/main/res/drawable-hdpi/ic_action_inbox.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_action_inbox_white.png b/src/main/res/drawable-hdpi/ic_action_inbox_white.png deleted file mode 100644 index c40d39937..000000000 Binary files a/src/main/res/drawable-hdpi/ic_action_inbox_white.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/ic_attach_money_black_18dp.png b/src/main/res/drawable-hdpi/ic_attach_money_black_18dp.png new file mode 100644 index 000000000..181d940da Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_money_black_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png new file mode 100644 index 000000000..ad0f76c29 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_money_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_money_black_36dp.png b/src/main/res/drawable-hdpi/ic_attach_money_black_36dp.png new file mode 100644 index 000000000..6eac3840c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_money_black_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_money_black_48dp.png b/src/main/res/drawable-hdpi/ic_attach_money_black_48dp.png new file mode 100644 index 000000000..a9478a6fd Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_money_black_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_money_white_18dp.png b/src/main/res/drawable-hdpi/ic_attach_money_white_18dp.png new file mode 100644 index 000000000..09175daa2 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_money_white_18dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png b/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png new file mode 100644 index 000000000..ee833c667 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_money_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_money_white_36dp.png b/src/main/res/drawable-hdpi/ic_attach_money_white_36dp.png new file mode 100644 index 000000000..182145a31 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_money_white_36dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_attach_money_white_48dp.png b/src/main/res/drawable-hdpi/ic_attach_money_white_48dp.png new file mode 100644 index 000000000..d4bde8132 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_attach_money_white_48dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_event_black_24dp.png b/src/main/res/drawable-hdpi/ic_event_black_24dp.png new file mode 100644 index 000000000..0a7167810 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_event_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_event_white_24dp.png b/src/main/res/drawable-hdpi/ic_event_white_24dp.png new file mode 100644 index 000000000..e6b1f0079 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_event_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_help_black_24dp.png b/src/main/res/drawable-hdpi/ic_help_black_24dp.png new file mode 100644 index 000000000..374fafd7f Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_help_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_help_white_24dp.png b/src/main/res/drawable-hdpi/ic_help_white_24dp.png new file mode 100644 index 000000000..5664f9532 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_help_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_history_black_24dp.png b/src/main/res/drawable-hdpi/ic_history_black_24dp.png new file mode 100644 index 000000000..b74e2899c Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_history_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_history_white_24dp.png b/src/main/res/drawable-hdpi/ic_history_white_24dp.png new file mode 100644 index 000000000..703d30b92 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_history_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-hdpi/ic_inbox_black_24dp.png new file mode 100644 index 000000000..dfedf997a Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_inbox_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_inbox_white_24dp.png b/src/main/res/drawable-hdpi/ic_inbox_white_24dp.png new file mode 100644 index 000000000..05489bdfa Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_inbox_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_label_black_24dp.png b/src/main/res/drawable-hdpi/ic_label_black_24dp.png new file mode 100644 index 000000000..9071a2912 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_label_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png b/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png new file mode 100644 index 000000000..49b215123 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_label_outline_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_label_outline_white_24dp.png b/src/main/res/drawable-hdpi/ic_label_outline_white_24dp.png new file mode 100644 index 000000000..53a196cb8 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_label_outline_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_label_white_24dp.png b/src/main/res/drawable-hdpi/ic_label_white_24dp.png new file mode 100644 index 000000000..47ca1f143 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_label_white_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_settings_black_24dp.png b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..acf1ddf85 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_black_24dp.png differ diff --git a/src/main/res/drawable-hdpi/ic_settings_white_24dp.png b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png new file mode 100644 index 000000000..97ded33b5 Binary files /dev/null and b/src/main/res/drawable-hdpi/ic_settings_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_action_gear.png b/src/main/res/drawable-xhdpi/ic_action_gear.png deleted file mode 100644 index da108c8eb..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_gear.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_gear_white.png b/src/main/res/drawable-xhdpi/ic_action_gear_white.png deleted file mode 100644 index fcb6564be..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_gear_white.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_help.png b/src/main/res/drawable-xhdpi/ic_action_help.png deleted file mode 100644 index 27909d8c8..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_help.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_help_white.png b/src/main/res/drawable-xhdpi/ic_action_help_white.png deleted file mode 100644 index 849292b62..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_help_white.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_inbox.png b/src/main/res/drawable-xhdpi/ic_action_inbox.png deleted file mode 100644 index a6762c9af..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_inbox.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_inbox_white.png b/src/main/res/drawable-xhdpi/ic_action_inbox_white.png deleted file mode 100644 index b6676af81..000000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_inbox_white.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_black_18dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_black_18dp.png new file mode 100644 index 000000000..ad0f76c29 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_money_black_18dp.png differ 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 new file mode 100644 index 000000000..c94dc6a74 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_money_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_black_36dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_black_36dp.png new file mode 100644 index 000000000..a9478a6fd Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_money_black_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_black_48dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_black_48dp.png new file mode 100644 index 000000000..49956bf6b Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_money_black_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_white_18dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_white_18dp.png new file mode 100644 index 000000000..ee833c667 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_money_white_18dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png new file mode 100644 index 000000000..20efc6cb7 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_money_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_white_36dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_white_36dp.png new file mode 100644 index 000000000..d4bde8132 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_money_white_36dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_attach_money_white_48dp.png b/src/main/res/drawable-xhdpi/ic_attach_money_white_48dp.png new file mode 100644 index 000000000..f3c568542 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_attach_money_white_48dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_event_black_24dp.png b/src/main/res/drawable-xhdpi/ic_event_black_24dp.png new file mode 100644 index 000000000..4b3cefa2b Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_event_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_event_white_24dp.png b/src/main/res/drawable-xhdpi/ic_event_white_24dp.png new file mode 100644 index 000000000..5356f8220 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_event_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_help_black_24dp.png b/src/main/res/drawable-xhdpi/ic_help_black_24dp.png new file mode 100644 index 000000000..d3542c6bc Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_help_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_help_white_24dp.png b/src/main/res/drawable-xhdpi/ic_help_white_24dp.png new file mode 100644 index 000000000..2d11cf47a Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_help_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_history_black_24dp.png b/src/main/res/drawable-xhdpi/ic_history_black_24dp.png new file mode 100644 index 000000000..8e44d94fd Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_history_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_history_white_24dp.png b/src/main/res/drawable-xhdpi/ic_history_white_24dp.png new file mode 100644 index 000000000..e188d4a37 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_history_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png new file mode 100644 index 000000000..078ef4d83 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_inbox_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_inbox_white_24dp.png b/src/main/res/drawable-xhdpi/ic_inbox_white_24dp.png new file mode 100644 index 000000000..33bac3349 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_inbox_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_label_black_24dp.png b/src/main/res/drawable-xhdpi/ic_label_black_24dp.png new file mode 100644 index 000000000..281364540 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_label_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_label_outline_black_24dp.png b/src/main/res/drawable-xhdpi/ic_label_outline_black_24dp.png new file mode 100644 index 000000000..7c470b6a5 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_label_outline_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_label_outline_white_24dp.png b/src/main/res/drawable-xhdpi/ic_label_outline_white_24dp.png new file mode 100644 index 000000000..55d1339a0 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_label_outline_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_label_white_24dp.png b/src/main/res/drawable-xhdpi/ic_label_white_24dp.png new file mode 100644 index 000000000..cfafd7c00 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_label_white_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..e84e188a1 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_black_24dp.png differ diff --git a/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png new file mode 100644 index 000000000..5caedc8e5 Binary files /dev/null and b/src/main/res/drawable-xhdpi/ic_settings_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_gear.png b/src/main/res/drawable-xxhdpi/ic_action_gear.png deleted file mode 100644 index 12fefb851..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_gear.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_gear_white.png b/src/main/res/drawable-xxhdpi/ic_action_gear_white.png deleted file mode 100644 index c4d30d4f4..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_gear_white.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_help.png b/src/main/res/drawable-xxhdpi/ic_action_help.png deleted file mode 100644 index ab4cb9bb9..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_help.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_help_white.png b/src/main/res/drawable-xxhdpi/ic_action_help_white.png deleted file mode 100644 index c49a9f8d0..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_help_white.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_inbox.png b/src/main/res/drawable-xxhdpi/ic_action_inbox.png deleted file mode 100644 index 0243136c2..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_inbox.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_inbox_white.png b/src/main/res/drawable-xxhdpi/ic_action_inbox_white.png deleted file mode 100644 index f84703b70..000000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_inbox_white.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_black_18dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_black_18dp.png new file mode 100644 index 000000000..6eac3840c Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_money_black_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png new file mode 100644 index 000000000..a9478a6fd Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_money_black_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_black_36dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_black_36dp.png new file mode 100644 index 000000000..732ecebff Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_money_black_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_black_48dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_black_48dp.png new file mode 100644 index 000000000..33dd4ea57 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_money_black_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_white_18dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_white_18dp.png new file mode 100644 index 000000000..182145a31 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_money_white_18dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png new file mode 100644 index 000000000..d4bde8132 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_money_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_white_36dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_white_36dp.png new file mode 100644 index 000000000..c85d4c93c Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_money_white_36dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_attach_money_white_48dp.png b/src/main/res/drawable-xxhdpi/ic_attach_money_white_48dp.png new file mode 100644 index 000000000..1218562fa Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_attach_money_white_48dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_event_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_event_black_24dp.png new file mode 100644 index 000000000..2f5815d2d Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_event_black_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_event_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_event_white_24dp.png new file mode 100644 index 000000000..0bcfe5b68 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_event_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png new file mode 100644 index 000000000..645822e83 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_help_black_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png new file mode 100644 index 000000000..d49181785 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_help_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png new file mode 100644 index 000000000..18519ee5a Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_history_black_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png new file mode 100644 index 000000000..f44df1afd Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png new file mode 100644 index 000000000..85c1923ed Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_inbox_black_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_inbox_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_inbox_white_24dp.png new file mode 100644 index 000000000..587f3e511 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_inbox_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_label_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_label_black_24dp.png new file mode 100644 index 000000000..c86bf6589 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_label_black_24dp.png differ 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 new file mode 100644 index 000000000..9a16a701c Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_label_outline_black_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_label_outline_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_label_outline_white_24dp.png new file mode 100644 index 000000000..5061cf71e Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_label_outline_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_label_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_label_white_24dp.png new file mode 100644 index 000000000..987112758 Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_label_white_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png new file mode 100644 index 000000000..3023ff8da Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_black_24dp.png differ diff --git a/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png new file mode 100644 index 000000000..eabb0a2ba Binary files /dev/null and b/src/main/res/drawable-xxhdpi/ic_settings_white_24dp.png differ diff --git a/src/main/res/drawable/ic_action_gear.png b/src/main/res/drawable/ic_action_gear.png deleted file mode 100644 index e01839358..000000000 Binary files a/src/main/res/drawable/ic_action_gear.png and /dev/null differ diff --git a/src/main/res/drawable/ic_action_gear_white.png b/src/main/res/drawable/ic_action_gear_white.png deleted file mode 100644 index 6a3d0393b..000000000 Binary files a/src/main/res/drawable/ic_action_gear_white.png and /dev/null differ diff --git a/src/main/res/drawable/ic_action_help.png b/src/main/res/drawable/ic_action_help.png deleted file mode 100644 index 49a8aa633..000000000 Binary files a/src/main/res/drawable/ic_action_help.png and /dev/null differ diff --git a/src/main/res/drawable/ic_action_help_white.png b/src/main/res/drawable/ic_action_help_white.png deleted file mode 100644 index 67d720016..000000000 Binary files a/src/main/res/drawable/ic_action_help_white.png and /dev/null differ diff --git a/src/main/res/drawable/ic_action_inbox.png b/src/main/res/drawable/ic_action_inbox.png deleted file mode 100644 index 25d565626..000000000 Binary files a/src/main/res/drawable/ic_action_inbox.png and /dev/null differ diff --git a/src/main/res/drawable/ic_action_inbox_white.png b/src/main/res/drawable/ic_action_inbox_white.png deleted file mode 100644 index a582c098b..000000000 Binary files a/src/main/res/drawable/ic_action_inbox_white.png and /dev/null differ diff --git a/src/main/res/drawable/ic_attach_money_black_18dp.png b/src/main/res/drawable/ic_attach_money_black_18dp.png new file mode 100644 index 000000000..96eaf71df Binary files /dev/null and b/src/main/res/drawable/ic_attach_money_black_18dp.png differ diff --git a/src/main/res/drawable/ic_attach_money_black_24dp.png b/src/main/res/drawable/ic_attach_money_black_24dp.png new file mode 100644 index 000000000..2ae5e6d14 Binary files /dev/null and b/src/main/res/drawable/ic_attach_money_black_24dp.png differ diff --git a/src/main/res/drawable/ic_attach_money_black_36dp.png b/src/main/res/drawable/ic_attach_money_black_36dp.png new file mode 100644 index 000000000..ad0f76c29 Binary files /dev/null and b/src/main/res/drawable/ic_attach_money_black_36dp.png differ diff --git a/src/main/res/drawable/ic_attach_money_black_48dp.png b/src/main/res/drawable/ic_attach_money_black_48dp.png new file mode 100644 index 000000000..c94dc6a74 Binary files /dev/null and b/src/main/res/drawable/ic_attach_money_black_48dp.png differ diff --git a/src/main/res/drawable/ic_attach_money_white_18dp.png b/src/main/res/drawable/ic_attach_money_white_18dp.png new file mode 100644 index 000000000..21a43c0b9 Binary files /dev/null and b/src/main/res/drawable/ic_attach_money_white_18dp.png differ diff --git a/src/main/res/drawable/ic_attach_money_white_24dp.png b/src/main/res/drawable/ic_attach_money_white_24dp.png new file mode 100644 index 000000000..707d16761 Binary files /dev/null and b/src/main/res/drawable/ic_attach_money_white_24dp.png differ diff --git a/src/main/res/drawable/ic_attach_money_white_36dp.png b/src/main/res/drawable/ic_attach_money_white_36dp.png new file mode 100644 index 000000000..ee833c667 Binary files /dev/null and b/src/main/res/drawable/ic_attach_money_white_36dp.png differ diff --git a/src/main/res/drawable/ic_attach_money_white_48dp.png b/src/main/res/drawable/ic_attach_money_white_48dp.png new file mode 100644 index 000000000..20efc6cb7 Binary files /dev/null and b/src/main/res/drawable/ic_attach_money_white_48dp.png differ diff --git a/src/main/res/drawable/ic_event_black_24dp.png b/src/main/res/drawable/ic_event_black_24dp.png new file mode 100644 index 000000000..c47f2812d Binary files /dev/null and b/src/main/res/drawable/ic_event_black_24dp.png differ diff --git a/src/main/res/drawable/ic_event_white_24dp.png b/src/main/res/drawable/ic_event_white_24dp.png new file mode 100644 index 000000000..35d8b1b31 Binary files /dev/null and b/src/main/res/drawable/ic_event_white_24dp.png differ diff --git a/src/main/res/drawable/ic_help_black_24dp.png b/src/main/res/drawable/ic_help_black_24dp.png new file mode 100644 index 000000000..f6e789ba1 Binary files /dev/null and b/src/main/res/drawable/ic_help_black_24dp.png differ diff --git a/src/main/res/drawable/ic_help_white_24dp.png b/src/main/res/drawable/ic_help_white_24dp.png new file mode 100644 index 000000000..db699622b Binary files /dev/null and b/src/main/res/drawable/ic_help_white_24dp.png differ diff --git a/src/main/res/drawable/ic_history_black_24dp.png b/src/main/res/drawable/ic_history_black_24dp.png new file mode 100644 index 000000000..e77a077ae Binary files /dev/null and b/src/main/res/drawable/ic_history_black_24dp.png differ diff --git a/src/main/res/drawable/ic_history_white_24dp.png b/src/main/res/drawable/ic_history_white_24dp.png new file mode 100644 index 000000000..b3000d31e Binary files /dev/null and b/src/main/res/drawable/ic_history_white_24dp.png differ diff --git a/src/main/res/drawable/ic_inbox_black_24dp.png b/src/main/res/drawable/ic_inbox_black_24dp.png new file mode 100644 index 000000000..0129706c1 Binary files /dev/null and b/src/main/res/drawable/ic_inbox_black_24dp.png differ diff --git a/src/main/res/drawable/ic_inbox_white_24dp.png b/src/main/res/drawable/ic_inbox_white_24dp.png new file mode 100644 index 000000000..548973aff Binary files /dev/null and b/src/main/res/drawable/ic_inbox_white_24dp.png differ diff --git a/src/main/res/drawable/ic_label_black_24dp.png b/src/main/res/drawable/ic_label_black_24dp.png new file mode 100644 index 000000000..119dc2105 Binary files /dev/null and b/src/main/res/drawable/ic_label_black_24dp.png differ diff --git a/src/main/res/drawable/ic_label_outline_black_24dp.png b/src/main/res/drawable/ic_label_outline_black_24dp.png new file mode 100644 index 000000000..1d600c216 Binary files /dev/null and b/src/main/res/drawable/ic_label_outline_black_24dp.png differ diff --git a/src/main/res/drawable/ic_label_outline_white_24dp.png b/src/main/res/drawable/ic_label_outline_white_24dp.png new file mode 100644 index 000000000..2a9e70b6a Binary files /dev/null and b/src/main/res/drawable/ic_label_outline_white_24dp.png differ diff --git a/src/main/res/drawable/ic_label_white_24dp.png b/src/main/res/drawable/ic_label_white_24dp.png new file mode 100644 index 000000000..79f032864 Binary files /dev/null and b/src/main/res/drawable/ic_label_white_24dp.png differ diff --git a/src/main/res/drawable/ic_settings_black_24dp.png b/src/main/res/drawable/ic_settings_black_24dp.png new file mode 100644 index 000000000..c59419c02 Binary files /dev/null and b/src/main/res/drawable/ic_settings_black_24dp.png differ diff --git a/src/main/res/drawable/ic_settings_white_24dp.png b/src/main/res/drawable/ic_settings_white_24dp.png new file mode 100644 index 000000000..8909c3553 Binary files /dev/null and b/src/main/res/drawable/ic_settings_white_24dp.png differ diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index c7769a15d..a8746a8d1 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -1,40 +1,39 @@ - - - + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - - + + @@ -44,24 +43,29 @@ - - - - - - - + + + + + + + + + + + + - - - + + + - - - + + + - - - + + + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 90cb4ccf7..c1558b35f 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -22,7 +22,7 @@ @drawable/ic_action_camera @drawable/ic_action_mic @drawable/ic_action_search - @drawable/ic_action_gear + @drawable/ic_settings_black_24dp @color/drawer_background @color/drawer_background_selected @@ -58,8 +58,13 @@ @drawable/ic_action_reload @drawable/ic_action_calendar_month @drawable/ic_action_add_light - @drawable/ic_action_inbox - @drawable/ic_action_help + @drawable/ic_inbox_black_24dp + @drawable/ic_help_black_24dp + @drawable/ic_attach_money_black_24dp + @drawable/ic_event_black_24dp + @drawable/ic_history_black_24dp + @drawable/ic_label_outline_black_24dp + @drawable/ic_label_black_24dp