From 1a859b99bc01fe116726a3bbf1c46f27e2e23040 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Tue, 2 Jun 2020 12:08:50 -0500 Subject: [PATCH] Use list icon instead of cloud icon --- .../main/java/com/todoroo/astrid/adapter/FilterViewHolder.kt | 4 ++-- .../java/org/tasks/activities/BaseListSettingsActivity.java | 2 +- app/src/main/java/org/tasks/data/CaldavCalendar.kt | 5 ++--- app/src/main/java/org/tasks/data/GoogleTaskList.kt | 5 ++--- app/src/main/java/org/tasks/themes/CustomIcons.kt | 3 +-- app/src/main/java/org/tasks/ui/ChipProvider.java | 4 ++-- app/src/main/java/org/tasks/ui/ListFragment.kt | 4 ++-- app/src/main/res/menu/menu_multi_select.xml | 2 +- app/src/main/res/xml/preferences_task_defaults.xml | 2 +- 9 files changed, 14 insertions(+), 17 deletions(-) diff --git a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.kt b/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.kt index f2cdb2555..016b1c066 100644 --- a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.kt +++ b/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.kt @@ -101,8 +101,8 @@ class FilterViewHolder : RecyclerView.ViewHolder { } return when (filter) { is TagFilter -> R.drawable.ic_outline_label_24px - is GtasksFilter -> R.drawable.ic_outline_cloud_24px - is CaldavFilter -> R.drawable.ic_outline_cloud_24px + is GtasksFilter -> R.drawable.ic_list_24px + is CaldavFilter -> R.drawable.ic_list_24px is CustomFilter -> R.drawable.ic_outline_filter_list_24px is PlaceFilter -> R.drawable.ic_outline_place_24px else -> filter.icon diff --git a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java b/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.java index a9313e17e..901af29fc 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.CLOUD); + icon = CustomIcons.getIconResId(CustomIcons.LIST); } 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/data/CaldavCalendar.kt b/app/src/main/java/org/tasks/data/CaldavCalendar.kt index 9a5480f2b..f1c603799 100644 --- a/app/src/main/java/org/tasks/data/CaldavCalendar.kt +++ b/app/src/main/java/org/tasks/data/CaldavCalendar.kt @@ -6,10 +6,9 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Property import com.todoroo.andlib.data.Table import com.todoroo.astrid.data.Task -import org.tasks.themes.CustomIcons.CLOUD +import org.tasks.themes.CustomIcons.LIST @Entity(tableName = "caldav_lists") class CaldavCalendar : Parcelable { @@ -59,7 +58,7 @@ class CaldavCalendar : Parcelable { } fun getIcon(): Int? { - return (if (icon == null) CLOUD else icon!!) + return (if (icon == null) LIST else icon!!) } fun setIcon(icon: Int?) { diff --git a/app/src/main/java/org/tasks/data/GoogleTaskList.kt b/app/src/main/java/org/tasks/data/GoogleTaskList.kt index d8f23773d..0dc84c0dc 100644 --- a/app/src/main/java/org/tasks/data/GoogleTaskList.kt +++ b/app/src/main/java/org/tasks/data/GoogleTaskList.kt @@ -6,9 +6,8 @@ import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey -import com.todoroo.andlib.data.Property import com.todoroo.andlib.data.Table -import org.tasks.themes.CustomIcons.CLOUD +import org.tasks.themes.CustomIcons.LIST @Entity(tableName = "google_task_lists") class GoogleTaskList : Parcelable { @@ -61,7 +60,7 @@ class GoogleTaskList : Parcelable { } fun getIcon(): Int? { - return (if (icon == null) CLOUD else icon!!) + return (if (icon == null) LIST else icon!!) } fun setIcon(icon: Int?) { diff --git a/app/src/main/java/org/tasks/themes/CustomIcons.kt b/app/src/main/java/org/tasks/themes/CustomIcons.kt index 422e752c2..953c07dae 100644 --- a/app/src/main/java/org/tasks/themes/CustomIcons.kt +++ b/app/src/main/java/org/tasks/themes/CustomIcons.kt @@ -6,7 +6,6 @@ object CustomIcons { 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 @@ -17,7 +16,7 @@ object CustomIcons { var ICONS = mapOf( LABEL to R.drawable.ic_outline_label_24px, FILTER to R.drawable.ic_outline_filter_list_24px, - CLOUD to R.drawable.ic_outline_cloud_24px, + 3 to R.drawable.ic_outline_cloud_24px, ALL_INBOX to R.drawable.ic_outline_all_inbox_24px, 5 to R.drawable.ic_outline_label_off_24px, HISTORY to R.drawable.ic_outline_history_24px, diff --git a/app/src/main/java/org/tasks/ui/ChipProvider.java b/app/src/main/java/org/tasks/ui/ChipProvider.java index dea77eab4..9f4eeaa84 100644 --- a/app/src/main/java/org/tasks/ui/ChipProvider.java +++ b/app/src/main/java/org/tasks/ui/ChipProvider.java @@ -121,10 +121,10 @@ public class ChipProvider { chips.add( newChip( lists.getGoogleTaskList(task.getGoogleTaskList()), - R.drawable.ic_outline_cloud_24px)); + R.drawable.ic_list_24px)); } else if (!isNullOrEmpty(task.getCaldav()) && !(filter instanceof CaldavFilter)) { chips.add( - newChip(lists.getCaldavList(task.getCaldav()), R.drawable.ic_outline_cloud_24px)); + newChip(lists.getCaldavList(task.getCaldav()), R.drawable.ic_list_24px)); } } String tagString = task.getTagsString(); diff --git a/app/src/main/java/org/tasks/ui/ListFragment.kt b/app/src/main/java/org/tasks/ui/ListFragment.kt index 3b01b5410..19a93854c 100644 --- a/app/src/main/java/org/tasks/ui/ListFragment.kt +++ b/app/src/main/java/org/tasks/ui/ListFragment.kt @@ -114,7 +114,7 @@ class ListFragment : TaskEditControlFragment() { get() = R.layout.control_set_remote_list override val icon: Int - get() = R.drawable.ic_outline_cloud_24px + get() = R.drawable.ic_list_24px override fun controlId() = TAG @@ -178,7 +178,7 @@ class ListFragment : TaskEditControlFragment() { textView.visibility = View.GONE chipGroup.visibility = View.VISIBLE chipGroup.removeAllViews() - val chip = chipProvider.newChip(selectedList, R.drawable.ic_outline_cloud_24px, true, true) + val chip = chipProvider.newChip(selectedList, R.drawable.ic_list_24px, true, true) chip.isCloseIconVisible = true chip.setOnClickListener { openPicker() } chip.setOnCloseIconClickListener { setSelected(null) } diff --git a/app/src/main/res/menu/menu_multi_select.xml b/app/src/main/res/menu/menu_multi_select.xml index 743ca8674..81444a36d 100644 --- a/app/src/main/res/menu/menu_multi_select.xml +++ b/app/src/main/res/menu/menu_multi_select.xml @@ -10,7 +10,7 @@ diff --git a/app/src/main/res/xml/preferences_task_defaults.xml b/app/src/main/res/xml/preferences_task_defaults.xml index c9cb4e175..83e9d1ee4 100644 --- a/app/src/main/res/xml/preferences_task_defaults.xml +++ b/app/src/main/res/xml/preferences_task_defaults.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto">