diff --git a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java index 663c86e1c..6b3891c65 100644 --- a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java +++ b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.java @@ -83,7 +83,7 @@ public final class BuiltInFilterExposer { public Filter getMyTasksFilter() { Filter myTasksFilter = getMyTasksFilter(context.getResources()); - myTasksFilter.icon = CustomIcons.getALL_INBOX(); + myTasksFilter.icon = CustomIcons.ALL_INBOX; return myTasksFilter; } @@ -92,12 +92,12 @@ public final class BuiltInFilterExposer { List filters = new ArrayList<>(); if (preferences.getBoolean(R.string.p_show_today_filter, true)) { Filter todayFilter = getTodayFilter(r); - todayFilter.icon = CustomIcons.getTODAY(); + todayFilter.icon = CustomIcons.TODAY; filters.add(todayFilter); } if (preferences.getBoolean(R.string.p_show_recently_modified_filter, true)) { Filter recentlyModifiedFilter = getRecentlyModifiedFilter(r); - recentlyModifiedFilter.icon = CustomIcons.getHISTORY(); + recentlyModifiedFilter.icon = CustomIcons.HISTORY; filters.add(recentlyModifiedFilter); } return filters; diff --git a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java b/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java index 3d3719c94..a9313e17e 100644 --- a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java +++ b/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java @@ -182,7 +182,7 @@ public abstract class BaseListSettingsActivity extends ThemedInjectingAppCompatA themeColor.applyToSystemBars(this); Integer icon = CustomIcons.getIconResId(selectedIcon); if (icon == null) { - icon = CustomIcons.getIconResId(CustomIcons.getCLOUD()); + icon = CustomIcons.getIconResId(CustomIcons.CLOUD); } DrawableUtil.setLeftDrawable(this, this.icon, icon); getLeftDrawable(this.icon).setTint(getColor(R.color.icon_tint_with_alpha)); diff --git a/app/src/main/java/org/tasks/themes/CustomIcons.kt b/app/src/main/java/org/tasks/themes/CustomIcons.kt index 188861d00..422e752c2 100644 --- a/app/src/main/java/org/tasks/themes/CustomIcons.kt +++ b/app/src/main/java/org/tasks/themes/CustomIcons.kt @@ -4,28 +4,16 @@ import org.tasks.R object CustomIcons { - @kotlin.jvm.JvmStatic - val LABEL = 1 + const val LABEL = 1 + const val FILTER = 2 + const val CLOUD = 3 + const val ALL_INBOX = 4 + const val HISTORY = 6 + const val TODAY = 7 + const val LIST = 8 + const val PLACE = 1050 - @kotlin.jvm.JvmStatic - val FILTER = 2 - - @kotlin.jvm.JvmStatic - val CLOUD = 3 - - @kotlin.jvm.JvmStatic - val ALL_INBOX = 4 - - @kotlin.jvm.JvmStatic - val HISTORY = 6 - - @kotlin.jvm.JvmStatic - val TODAY = 7 - - @kotlin.jvm.JvmStatic - val PLACE = 1050 - - @kotlin.jvm.JvmField + @JvmStatic var ICONS = mapOf( LABEL to R.drawable.ic_outline_label_24px, FILTER to R.drawable.ic_outline_filter_list_24px, @@ -34,6 +22,7 @@ object CustomIcons { 5 to R.drawable.ic_outline_label_off_24px, HISTORY to R.drawable.ic_outline_history_24px, TODAY to R.drawable.ic_outline_today_24px, + LIST to R.drawable.ic_list_24px, 1000 to R.drawable.ic_outline_flag_24px, 1062 to R.drawable.ic_outline_home_24px, 1041 to R.drawable.ic_outline_work_outline_24px, @@ -197,12 +186,12 @@ object CustomIcons { 1160 to R.drawable.ic_thumb_down_24px ) - @kotlin.jvm.JvmStatic + @JvmStatic fun getIconList() = ICONS.keys.toList() - @kotlin.jvm.JvmStatic + @JvmStatic fun getIconResId(index: Int) = ICONS[index] - @kotlin.jvm.JvmStatic + @JvmStatic fun getIndex(position: Int) = getIconList()[position] } diff --git a/app/src/main/res/drawable/ic_list_24px.xml b/app/src/main/res/drawable/ic_list_24px.xml new file mode 100644 index 000000000..b2a34a898 --- /dev/null +++ b/app/src/main/res/drawable/ic_list_24px.xml @@ -0,0 +1,5 @@ + + +