diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 1bd105ec3..157637815 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -51,8 +51,8 @@ android {
defaultConfig {
testApplicationId = "org.tasks.test"
applicationId = "org.tasks"
- versionCode = 131005
- versionName = "13.10"
+ versionCode = 131100
+ versionName = "13.11"
targetSdk = libs.versions.android.targetSdk.get().toInt()
minSdk = libs.versions.android.minSdk.get().toInt()
testInstrumentationRunner = "org.tasks.TestRunner"
@@ -183,6 +183,8 @@ dependencies {
implementation(libs.androidx.lifecycle.viewmodel)
implementation(libs.androidx.room)
implementation(libs.androidx.appcompat)
+ implementation(libs.iconics)
+ implementation(libs.iconics.material.design)
implementation(libs.markwon)
implementation(libs.markwon.editor)
implementation(libs.markwon.linkify)
diff --git a/app/proguard.pro b/app/proguard.pro
index 8cd5b1484..f7a1e2d78 100644
--- a/app/proguard.pro
+++ b/app/proguard.pro
@@ -54,3 +54,6 @@
-dontwarn org.joda.convert.FromString
-dontwarn org.joda.convert.ToString
-dontwarn org.json.JSONString
+
+# material icons
+-keep class androidx.compose.material.icons.outlined.**
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 093b90086..4f0d471cc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -214,6 +214,13 @@
android:taskAffinity=""
android:theme="@style/TranslucentDialog"/>
+
+
diff --git a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt b/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt
index 7fbbe13cf..82d0fa255 100644
--- a/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt
+++ b/app/src/main/java/com/todoroo/astrid/activity/MainActivityViewModel.kt
@@ -8,9 +8,6 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.todoroo.astrid.activity.MainActivity.Companion.LOAD_FILTER
import com.todoroo.astrid.activity.MainActivity.Companion.OPEN_FILTER
-import com.todoroo.astrid.api.CustomFilter
-import org.tasks.filters.GtasksFilter
-import org.tasks.filters.TagFilter
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
@@ -22,7 +19,6 @@ import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
import org.tasks.LocalBroadcastManager
-import org.tasks.R
import org.tasks.Tasks.Companion.IS_GENERIC
import org.tasks.billing.Inventory
import org.tasks.compose.drawer.DrawerItem
@@ -35,11 +31,10 @@ import org.tasks.filters.CaldavFilter
import org.tasks.filters.Filter
import org.tasks.filters.FilterProvider
import org.tasks.filters.NavigationDrawerSubheader
-import org.tasks.filters.PlaceFilter
+import org.tasks.filters.getIcon
import org.tasks.preferences.DefaultFilterProvider
import org.tasks.preferences.Preferences
import org.tasks.themes.ColorProvider
-import org.tasks.themes.CustomIcons
import timber.log.Timber
import javax.inject.Inject
@@ -135,7 +130,7 @@ class MainActivityViewModel @Inject constructor(
is Filter ->
DrawerItem.Filter(
title = item.title ?: "",
- icon = getIcon(item),
+ icon = item.getIcon(inventory),
color = getColor(item),
count = item.count.takeIf { it != NO_COUNT } ?: try {
taskDao.count(item)
@@ -166,7 +161,7 @@ class MainActivityViewModel @Inject constructor(
.map { item ->
DrawerItem.Filter(
title = item.title ?: "",
- icon = getIcon(item),
+ icon = item.getIcon(inventory),
color = getColor(item),
count = item.count.takeIf { it != NO_COUNT } ?: try {
taskDao.count(item)
@@ -192,24 +187,6 @@ class MainActivityViewModel @Inject constructor(
return 0
}
- private fun getIcon(filter: Filter): Int {
- if (filter.icon < 1000 || filter.icon == CustomIcons.PLACE || inventory.hasPro) {
- val icon = CustomIcons.getIconResId(filter.icon)
- if (icon != null) {
- return icon
- }
- }
- return when (filter) {
- is TagFilter -> R.drawable.ic_outline_label_24px
- is GtasksFilter,
- 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
- }
- }
-
fun toggleCollapsed(subheader: NavigationDrawerSubheader) = viewModelScope.launch {
val collapsed = !subheader.isCollapsed
when (subheader.subheaderType) {
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 4fbe67478..d3dc87e07 100644
--- a/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.kt
+++ b/app/src/main/java/com/todoroo/astrid/adapter/FilterViewHolder.kt
@@ -5,21 +5,23 @@ import android.view.View
import android.widget.CheckedTextView
import android.widget.ImageView
import android.widget.TextView
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.ui.graphics.Color
import androidx.core.view.isVisible
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.recyclerview.widget.RecyclerView
-import org.tasks.filters.CaldavFilter
-import com.todoroo.astrid.api.CustomFilter
-import org.tasks.filters.GtasksFilter
-import org.tasks.filters.TagFilter
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
import org.tasks.R
import org.tasks.billing.Inventory
+import org.tasks.compose.components.imageVectorByName
import org.tasks.databinding.FilterAdapterRowBinding
import org.tasks.extensions.formatNumber
+import org.tasks.filters.CaldavFilter
import org.tasks.filters.Filter
-import org.tasks.filters.PlaceFilter
+import org.tasks.filters.getIcon
import org.tasks.themes.ColorProvider
-import org.tasks.themes.CustomIcons.getIconResId
-import org.tasks.themes.DrawableUtil
import java.util.Locale
class FilterViewHolder internal constructor(
@@ -34,9 +36,10 @@ class FilterViewHolder internal constructor(
private val row: View
private val text: CheckedTextView
- private val icon: ImageView
private val size: TextView
private val shareIndicator: ImageView
+ private val icon = MutableStateFlow(null)
+ private val color = MutableStateFlow(0)
lateinit var filter: Filter
@@ -44,7 +47,15 @@ class FilterViewHolder internal constructor(
FilterAdapterRowBinding.bind(itemView).let {
row = it.row
text = it.text
- icon = it.icon
+ it.icon.setContent {
+ val label = icon.collectAsStateWithLifecycle().value
+ val tint = color.collectAsStateWithLifecycle().value
+ Icon(
+ imageVector = imageVectorByName(label!!)!!,
+ contentDescription = label,
+ tint = if (tint == 0) MaterialTheme.colorScheme.onSurface else Color(tint),
+ )
+ }
size = it.size
shareIndicator = it.shareIndicator
}
@@ -64,9 +75,8 @@ class FilterViewHolder internal constructor(
} else {
text.isChecked = selected
}
- val icon = getIcon(filter)
- this.icon.setImageDrawable(DrawableUtil.getWrapped(context, icon))
- this.icon.drawable.setTint(getColor(filter))
+ icon.update { filter.getIcon(inventory) }
+ color.update { getColor(filter) }
text.text = filter.title
if (count == null || count == 0) {
size.visibility = View.INVISIBLE
@@ -97,21 +107,4 @@ class FilterViewHolder internal constructor(
}
return context.getColor(R.color.text_primary)
}
-
- private fun getIcon(filter: Filter): Int {
- if (filter.icon < 1000 || inventory.hasPro) {
- val icon = getIconResId(filter.icon)
- if (icon != null) {
- return icon
- }
- }
- return when (filter) {
- is TagFilter -> R.drawable.ic_outline_label_24px
- is GtasksFilter,
- 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
- }
- }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt b/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt
index 18efc882e..28b9298b0 100644
--- a/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt
+++ b/app/src/main/java/com/todoroo/astrid/api/CustomFilter.kt
@@ -3,7 +3,7 @@ package com.todoroo.astrid.api
import kotlinx.parcelize.Parcelize
import org.tasks.filters.Filter
import org.tasks.filters.FilterListItem
-import org.tasks.themes.CustomIcons
+import org.tasks.themes.TasksIcons
@Parcelize
data class CustomFilter(
@@ -25,8 +25,10 @@ data class CustomFilter(
val id: Long
get() = filter.id
- override val icon: Int
- get() = filter.icon ?: CustomIcons.FILTER
+
+ override val icon: String
+ get() = filter.icon ?: TasksIcons.FILTER_LIST
+
override val tint: Int
get() = filter.color ?: 0
diff --git a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.kt b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.kt
index 039f0a129..eafdb23ac 100644
--- a/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.kt
+++ b/app/src/main/java/com/todoroo/astrid/core/BuiltInFilterExposer.kt
@@ -27,6 +27,7 @@ import org.tasks.filters.SnoozedFilter
import org.tasks.filters.TimerFilter
import org.tasks.filters.TodayFilter
import org.tasks.preferences.Preferences
+import org.tasks.themes.TasksIcons
import javax.inject.Inject
class BuiltInFilterExposer @Inject constructor(
@@ -73,14 +74,14 @@ class BuiltInFilterExposer @Inject constructor(
.join(Join.left(CaldavTask.TABLE, CaldavTask.TASK.eq(Task.ID)))
.where(CaldavTask.ID.eq(null))
.toString(),
- icon = R.drawable.ic_outline_cloud_off_24px,
+ icon = TasksIcons.CLOUD_OFF,
)
fun getDeleted() =
FilterImpl(
title = "Deleted",
sql = QueryTemplate().where(Task.DELETION_DATE.gt(0)).toString(),
- icon = R.drawable.ic_outline_delete_24px,
+ icon = TasksIcons.DELETE,
)
fun getMissingListFilter() =
@@ -96,7 +97,7 @@ class BuiltInFilterExposer @Inject constructor(
)
.where(and(CaldavTask.ID.gt(0), CaldavCalendar.UUID.eq(null)))
.toString(),
- icon = R.drawable.ic_outline_cloud_off_24px,
+ icon = TasksIcons.CLOUD_OFF,
)
fun getMissingAccountFilter() =
@@ -114,28 +115,28 @@ class BuiltInFilterExposer @Inject constructor(
)
.where(and(CaldavTask.ID.gt(0), CaldavAccount.UUID.eq(null)))
.toString(),
- icon = R.drawable.ic_outline_cloud_off_24px,
+ icon = TasksIcons.CLOUD_OFF,
)
fun getNoTitleFilter() =
FilterImpl(
title = "No title",
sql = QueryTemplate().where(or(Task.TITLE.eq(null), Task.TITLE.eq(""))).toString(),
- icon = R.drawable.ic_outline_clear_24px,
+ icon = TasksIcons.CLEAR,
)
fun getNoCreateDateFilter() =
FilterImpl(
title = "No create time",
sql = QueryTemplate().where(Task.CREATION_DATE.eq(0)).toString(),
- icon = R.drawable.ic_outline_add_24px,
+ icon = TasksIcons.ADD,
)
fun getNoModificationDateFilter() =
FilterImpl(
title = "No modify time",
sql = QueryTemplate().where(Task.MODIFICATION_DATE.eq(0)).toString(),
- icon = R.drawable.ic_outline_edit_24px,
+ icon = TasksIcons.EDIT,
)
fun getRecentlyModifiedFilter(r: Resources) =
diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrade_13_11.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrade_13_11.kt
new file mode 100644
index 000000000..77c8eb449
--- /dev/null
+++ b/app/src/main/java/com/todoroo/astrid/service/Upgrade_13_11.kt
@@ -0,0 +1,253 @@
+@file:Suppress("ClassName")
+
+package com.todoroo.astrid.service
+
+import org.tasks.data.dao.CaldavDao
+import org.tasks.data.dao.FilterDao
+import org.tasks.data.dao.LocationDao
+import org.tasks.data.dao.TagDataDao
+import org.tasks.themes.TasksIcons
+import org.tasks.themes.TasksIcons.ALL_INBOX
+import org.tasks.themes.TasksIcons.CLEAR
+import org.tasks.themes.TasksIcons.CLOUD
+import org.tasks.themes.TasksIcons.DELETE
+import org.tasks.themes.TasksIcons.EDIT
+import org.tasks.themes.TasksIcons.FILTER_LIST
+import org.tasks.themes.TasksIcons.HISTORY
+import org.tasks.themes.TasksIcons.LABEL
+import org.tasks.themes.TasksIcons.LABEL_OFF
+import org.tasks.themes.TasksIcons.NOTIFICATIONS
+import org.tasks.themes.TasksIcons.PENDING_ACTIONS
+import org.tasks.themes.TasksIcons.PLACE
+import org.tasks.themes.TasksIcons.TIMER
+import org.tasks.themes.TasksIcons.TODAY
+import javax.inject.Inject
+
+class Upgrade_13_11 @Inject constructor(
+ private val locationDao: LocationDao,
+ private val filterDao: FilterDao,
+ private val tagDataDao: TagDataDao,
+ private val caldavDao: CaldavDao,
+) {
+ internal suspend fun migrateIcons() {
+ locationDao.getPlaces().forEach {
+ locationDao.update(it.copy(icon = it.icon.migrateLegacyIcon()))
+ }
+ filterDao.getFilters().forEach {
+ filterDao.update(it.copy(icon = it.icon.migrateLegacyIcon()))
+ }
+ tagDataDao.getAll().forEach {
+ tagDataDao.update(it.copy(icon = it.icon.migrateLegacyIcon()))
+ }
+ caldavDao.getCalendars().forEach {
+ caldavDao.update(it.copy(icon = it.icon.migrateLegacyIcon()))
+ }
+ }
+
+ companion object {
+ const val VERSION = 131100
+
+ fun String?.migrateLegacyIcon(): String? =
+ LEGACY_ICONS[this?.toIntOrNull()] ?: this
+
+ private val LEGACY_ICONS by lazy {
+ mapOf(
+ 1 to LABEL,
+ 2 to FILTER_LIST,
+ 3 to CLOUD,
+ 4 to ALL_INBOX,
+ 5 to LABEL_OFF,
+ 6 to HISTORY,
+ 7 to TODAY,
+ 8 to TasksIcons.LIST,
+ 1000 to "flag",
+ 1062 to "home",
+ 1041 to "work_outline",
+ 1001 to "pets",
+ 1002 to "payment",
+ 1003 to "attach_money",
+ 1059 to "euro_symbol",
+ 1042 to "store",
+ 1043 to "shopping_cart",
+ 1004 to "hourglass_empty",
+ 1005 to "favorite_border",
+ 1006 to "school",
+ 1007 to "drive_eta",
+ 1008 to "whatshot",
+ 1009 to "star_border",
+ 1010 to "account_balance",
+ 1011 to "location_city",
+ 1012 to "cake",
+ 1013 to "kitchen",
+ 1014 to "fitness_center",
+ 1015 to "child_friendly",
+ 1016 to "free_breakfast",
+ 1017 to "golf_course",
+ 1018 to "beach_access",
+ 1019 to "restaurant_menu",
+ 1020 to "local_pharmacy",
+ 1021 to "fastfood",
+ 1022 to "hotel",
+ 1023 to "flight",
+ 1057 to "flight_takeoff",
+ 1058 to "flight_land",
+ 1024 to "directions_run",
+ 1025 to "wb_sunny",
+ 1026 to "desktop_mac",
+ 1027 to "computer",
+ 1028 to "format_paint",
+ 1029 to "storage",
+ 1030 to "send",
+ 1031 to "weekend",
+ 1032 to "link",
+ 1033 to "business",
+ 1034 to "chat_bubble_outline",
+ 1035 to "voicemail",
+ 1036 to "email",
+ 1037 to "call",
+ 1039 to "movie",
+ 1040 to "equalizer",
+ 1071 to "pie_chart",
+ 1072 to "show_chart",
+ 1044 to "schedule",
+ 1045 to "photo_camera",
+ 1046 to DELETE,
+ 1047 to "attachment",
+ 1048 to "vpn_key",
+ 1049 to "event",
+ 1050 to PLACE,
+ 1051 to "markunread_mailbox",
+ 1052 to "label_important",
+ 1053 to "android",
+ 1054 to "build",
+ 1055 to "bug_report",
+ 1056 to "book",
+ 1060 to "explore",
+ 1061 to "gavel",
+ 1063 to "print",
+ 1064 to "receipt",
+ 1038 to "new_releases",
+ 1065 to "report_problem",
+ 1068 to "error_outline",
+ 1069 to "not_interested",
+ 1070 to "report",
+ 1066 to "turned_in",
+ 1067 to "turned_in_not",
+ 1073 to "headset",
+ 1074 to "mic_none",
+ 1075 to TIMER,
+ 1076 to CLEAR,
+ 1077 to "search",
+ 1078 to "repeat",
+ 1079 to NOTIFICATIONS,
+ 1080 to "star_half",
+ 1081 to "share",
+ 1082 to "sentiment_very_satisfied",
+ 1083 to "sentiment_very_dissatisfied",
+ 1084 to "sentiment_satisfied",
+ 1085 to "sentiment_dissatisfied",
+ 1086 to "mood_bad",
+ 1087 to "mood",
+ 1088 to "spa",
+ 1089 to "room_service",
+ 1090 to "meeting_room",
+ 1091 to "hot_tub",
+ 1092 to "business_center",
+ 1093 to "priority_high",
+ 1094 to "power",
+ 1095 to "power_off",
+ 1096 to "directions_bike",
+ 1097 to "local_florist",
+ 1098 to "local_pizza",
+ 1099 to "navigation",
+ 1100 to "local_play",
+ 1101 to "local_bar",
+ 1102 to "local_laundry_service",
+ 1103 to "local_offer",
+ 1104 to "local_shipping",
+ 1105 to "local_hospital",
+ 1106 to "directions_boat",
+ 1107 to "directions_walk",
+ 1108 to "wb_incandescent",
+ 1109 to "landscape",
+ 1110 to "music_note",
+ 1111 to "healing",
+ 1112 to "brush",
+ 1113 to "brightness_2",
+ 1114 to "security",
+ 1115 to "scanner",
+ 1116 to "router",
+ 1117 to "watch",
+ 1118 to "videogame_asset",
+ 1119 to "cached",
+// 1120 to "ic_octocat",
+ 1121 to "perm_identity",
+ 1122 to "track_changes",
+ 1123 to "open_in_new",
+ 1124 to EDIT,
+ 1125 to "info",
+ 1126 to "palette",
+ 1127 to "sd_storage",
+ 1128 to "baseline_lens",
+ 1129 to "map",
+ 1130 to "check_blackdp",
+ 1131 to "undo",
+ 1132 to "next_week",
+ 1133 to "local_cafe",
+ 1134 to "nights_stay",
+ 1135 to "single_bed",
+ 1136 to "weather_sunset",
+ 1137 to "calendar_today",
+ 1138 to "select_all",
+ 1139 to "widgets",
+ 1140 to "call_split",
+ 1141 to "ac_unit",
+ 1142 to "airport_shuttle",
+ 1143 to "apartment",
+ 1144 to "bathtub",
+ 1145 to "casino",
+ 1146 to "child_care",
+ 1147 to "pool",
+ 1148 to "house",
+ 1149 to "storefront",
+ 1150 to "poll",
+ 1151 to "emoji_transportation",
+ 1152 to "emoji_objects",
+ 1153 to "emoji_nature",
+ 1154 to "emoji_food_beverage",
+ 1155 to "emoji_events",
+ 1156 to "deck",
+ 1157 to "fireplace",
+ 1158 to "outdoor_grill",
+ 1159 to "thumb_up",
+ 1160 to "thumb_down",
+ 1161 to "vertical_align_top",
+ 1162 to "keyboard_arrow_left",
+ 1163 to "keyboard_arrow_right",
+ 1164 to "content_paste",
+ 1165 to "content_copy",
+ 1166 to "play_arrow",
+ 1167 to "play_circle_outline",
+ 1168 to "not_started",
+ 1169 to "date_range",
+ 1170 to PENDING_ACTIONS,
+ 1171 to "visibility_off",
+ 1172 to "nature",
+ 1173 to "eco",
+ 1174 to "bedtime",
+ 1175 to "auto_stories",
+ 1176 to "flash_on",
+ 1177 to "wb_twilight",
+ 1178 to "local_atm",
+ 1179 to "cleaning_services",
+ 1180 to "plumbing",
+ 1181 to "pest_control_rodent",
+ 1182 to "people_outline",
+ 1183 to "forum",
+// 1184 to "twitter_logo_black",
+ 1185 to "person_add",
+ 1186 to "block",
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt
index e5327c8c5..0e1023b4a 100644
--- a/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt
+++ b/app/src/main/java/com/todoroo/astrid/service/Upgrader.kt
@@ -64,6 +64,7 @@ class Upgrader @Inject constructor(
private val upgrade_11_12_3: Lazy,
private val upgrade_12_4: Lazy,
private val upgrade_13_2: Lazy,
+ private val upgrade_13_11: Lazy,
) {
fun upgrade(from: Int, to: Int) {
@@ -114,6 +115,9 @@ class Upgrader @Inject constructor(
caldavDao.updateParents()
upgrade_13_2.get().rebuildFilters()
}
+ run(from, Upgrade_13_11.VERSION) {
+ upgrade_13_11.get().migrateIcons()
+ }
preferences.setBoolean(R.string.p_just_updated, true)
} else {
setInstallDetails(to)
diff --git a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt b/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt
index ce5fae951..2cd871608 100644
--- a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt
@@ -1,6 +1,5 @@
package org.tasks.activities
-import android.content.DialogInterface
import android.graphics.drawable.LayerDrawable
import android.os.Bundle
import android.view.MenuItem
@@ -8,36 +7,51 @@ import android.view.View
import android.view.ViewGroup
import android.widget.TextView
import androidx.appcompat.widget.Toolbar
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.ColorFilter
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.lifecycleScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import org.tasks.R
+import org.tasks.compose.IconPickerActivity.Companion.launchIconPicker
+import org.tasks.compose.IconPickerActivity.Companion.registerForIconPickerResult
+import org.tasks.compose.components.imageVectorByName
import org.tasks.dialogs.ColorPalettePicker
import org.tasks.dialogs.ColorPalettePicker.Companion.newColorPalette
import org.tasks.dialogs.ColorPickerAdapter.Palette
import org.tasks.dialogs.ColorWheelPicker
import org.tasks.dialogs.DialogBuilder
-import org.tasks.dialogs.IconPickerDialog
-import org.tasks.dialogs.IconPickerDialog.IconPickerCallback
import org.tasks.extensions.addBackPressedCallback
import org.tasks.injection.ThemedInjectingAppCompatActivity
import org.tasks.themes.ColorProvider
-import org.tasks.themes.CustomIcons.getIconResId
import org.tasks.themes.DrawableUtil
+import org.tasks.themes.TasksTheme
import org.tasks.themes.ThemeColor
import javax.inject.Inject
-abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), IconPickerCallback, Toolbar.OnMenuItemClickListener, ColorPalettePicker.ColorPickedCallback, ColorWheelPicker.ColorPickedCallback {
+abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), Toolbar.OnMenuItemClickListener, ColorPalettePicker.ColorPickedCallback, ColorWheelPicker.ColorPickedCallback {
@Inject lateinit var dialogBuilder: DialogBuilder
@Inject lateinit var colorProvider: ColorProvider
+ protected abstract val defaultIcon: String
protected var selectedColor = 0
- protected var selectedIcon = -1
+ protected var selectedIcon = MutableStateFlow(null)
private lateinit var clear: View
private lateinit var color: TextView
- private lateinit var icon: TextView
protected lateinit var toolbar: Toolbar
protected lateinit var colorRow: ViewGroup
- protected abstract val defaultIcon: Int
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
@@ -50,12 +64,36 @@ abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), Ic
colorRow = findViewById(R.id.color_row).apply {
setOnClickListener { showThemePicker() }
}
- icon = findViewById(R.id.icon)
+ findViewById(R.id.icon).setContent {
+ TasksTheme {
+ Row(
+ verticalAlignment = Alignment.CenterVertically,
+ ) {
+ val name = selectedIcon.collectAsStateWithLifecycle().value
+ val icon = imageVectorByName(name ?:defaultIcon)
+ if (icon != null) {
+ Image(
+ imageVector = icon,
+ contentDescription = name ?: defaultIcon,
+ colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+ )
+ }
+ Spacer(modifier = Modifier.width(34.dp))
+ Text(
+ text = "Icon",
+ style = MaterialTheme.typography.bodyLarge.copy(
+ fontSize = 18.sp,
+ ),
+ color = MaterialTheme.colorScheme.onSurface,
+ )
+ }
+ }
+ }
findViewById(R.id.icon_row).setOnClickListener { showIconPicker() }
toolbar = view.findViewById(R.id.toolbar)
if (savedInstanceState != null) {
selectedColor = savedInstanceState.getInt(EXTRA_SELECTED_THEME)
- selectedIcon = savedInstanceState.getInt(EXTRA_SELECTED_ICON)
+ selectedIcon.update { savedInstanceState.getString(EXTRA_SELECTED_ICON) }
}
toolbar.title = toolbarTitle
toolbar.navigationIcon = getDrawable(R.drawable.ic_outline_save_24px)
@@ -73,7 +111,7 @@ abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), Ic
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
outState.putInt(EXTRA_SELECTED_THEME, selectedColor)
- outState.putInt(EXTRA_SELECTED_ICON, selectedIcon)
+ outState.putString(EXTRA_SELECTED_ICON, selectedIcon.value)
}
protected abstract fun hasChanges(): Boolean
@@ -103,14 +141,12 @@ abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), Ic
.show(supportFragmentManager, FRAG_TAG_COLOR_PICKER)
}
- private fun showIconPicker() {
- IconPickerDialog.newIconPicker(selectedIcon).show(supportFragmentManager, FRAG_TAG_ICON_PICKER)
+ val launcher = registerForIconPickerResult { selected ->
+ selectedIcon.update { selected }
}
- override fun onSelected(dialogInterface: DialogInterface, icon: Int) {
- selectedIcon = icon
- dialogInterface.dismiss()
- updateTheme()
+ private fun showIconPicker() {
+ launcher.launchIconPicker(this, selectedIcon.value)
}
override fun onColorPicked(color: Int) {
@@ -150,9 +186,6 @@ abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), Ic
clear.visibility = View.VISIBLE
}
themeColor.applyToNavigationBar(this)
- val icon = getIconResId(selectedIcon) ?: getIconResId(defaultIcon)
- DrawableUtil.setLeftDrawable(this, this.icon, icon!!)
- DrawableUtil.getLeftDrawable(this.icon).setTint(getColor(R.color.icon_tint_with_alpha))
}
companion object {
@@ -161,4 +194,4 @@ abstract class BaseListSettingsActivity : ThemedInjectingAppCompatActivity(), Ic
private const val FRAG_TAG_ICON_PICKER = "frag_tag_icon_picker"
private const val FRAG_TAG_COLOR_PICKER = "frag_tag_color_picker"
}
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt
index 76ad40d63..7e41427d4 100644
--- a/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/FilterSettingsActivity.kt
@@ -33,6 +33,7 @@ import com.todoroo.astrid.core.CustomFilterItemTouchHelper
import org.tasks.data.db.Database
import org.tasks.data.entity.Task
import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import org.tasks.LocalBroadcastManager
import org.tasks.R
@@ -49,7 +50,7 @@ import org.tasks.extensions.Context.openUri
import org.tasks.extensions.hideKeyboard
import org.tasks.filters.FilterCriteriaProvider
import org.tasks.filters.mapToSerializedString
-import org.tasks.themes.CustomIcons
+import org.tasks.themes.TasksIcons
import java.util.Locale
import javax.inject.Inject
import kotlin.math.max
@@ -70,14 +71,14 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
private var filter: CustomFilter? = null
private lateinit var adapter: CustomFilterAdapter
private var criteria: MutableList = ArrayList()
- override val defaultIcon: Int = CustomIcons.FILTER
+ override val defaultIcon = TasksIcons.FILTER_LIST
override fun onCreate(savedInstanceState: Bundle?) {
filter = intent.getParcelableExtra(TOKEN_FILTER)
super.onCreate(savedInstanceState)
if (savedInstanceState == null && filter != null) {
selectedColor = filter!!.tint
- selectedIcon = filter!!.icon
+ selectedIcon.update { filter!!.icon }
name.setText(filter!!.title)
}
when {
@@ -245,7 +246,7 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
id = filter?.id ?: 0L,
title = newName,
color = selectedColor,
- icon = selectedIcon,
+ icon = selectedIcon.value,
values = criteria.values,
criterion = CriterionInstance.serialize(criteria),
sql = criteria.sql,
@@ -276,10 +277,10 @@ class FilterSettingsActivity : BaseListSettingsActivity() {
override fun hasChanges(): Boolean {
return if (isNew) {
(!Strings.isNullOrEmpty(newName)
- || selectedColor != 0 || selectedIcon != -1 || criteria.size > 1)
+ || selectedColor != 0 || selectedIcon.value?.isBlank() == false || criteria.size > 1)
} else newName != filter!!.title
|| selectedColor != filter!!.tint
- || selectedIcon != filter!!.icon
+ || selectedIcon.value != filter!!.icon
|| CriterionInstance.serialize(criteria) != filter!!.criterion!!.trim()
|| criteria.values != filter!!.valuesForNewTasks
|| criteria.sql != filter!!.sql
diff --git a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt
index f697cdf20..795c3ba00 100644
--- a/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/GoogleTaskListSettingsActivity.kt
@@ -13,22 +13,23 @@ import com.google.android.material.textfield.TextInputEditText
import com.google.api.services.tasks.model.TaskList
import com.todoroo.astrid.activity.MainActivity
import com.todoroo.astrid.activity.TaskListFragment
-import org.tasks.filters.GtasksFilter
import com.todoroo.astrid.service.TaskDeleter
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.NonCancellable
+import kotlinx.coroutines.flow.update
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import org.tasks.LocalBroadcastManager
import org.tasks.R
import org.tasks.Strings.isNullOrEmpty
+import org.tasks.data.dao.GoogleTaskListDao
import org.tasks.data.entity.CaldavAccount
import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.dao.GoogleTaskListDao
import org.tasks.databinding.ActivityGoogleTaskListSettingsBinding
import org.tasks.extensions.Context.hideKeyboard
import org.tasks.extensions.Context.toast
-import org.tasks.themes.CustomIcons
+import org.tasks.filters.GtasksFilter
+import org.tasks.themes.TasksIcons
import timber.log.Timber
import javax.inject.Inject
@@ -46,7 +47,7 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
private val createListViewModel: CreateListViewModel by viewModels()
private val renameListViewModel: RenameListViewModel by viewModels()
private val deleteListViewModel: DeleteListViewModel by viewModels()
- override val defaultIcon: Int = CustomIcons.LIST
+ override val defaultIcon = TasksIcons.LIST
override fun onCreate(savedInstanceState: Bundle?) {
gtasksList = intent.getParcelableExtra(EXTRA_STORE_DATA)
@@ -58,7 +59,7 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
super.onCreate(savedInstanceState)
if (savedInstanceState == null) {
selectedColor = gtasksList.color
- selectedIcon = gtasksList.getIcon()!!
+ selectedIcon.update { gtasksList.icon }
}
if (isNewList) {
name.requestFocus()
@@ -115,8 +116,11 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
else -> {
if (colorChanged() || iconChanged()) {
gtasksList.color = selectedColor
- gtasksList.setIcon(selectedIcon)
- googleTaskListDao.insertOrReplace(gtasksList)
+ googleTaskListDao.insertOrReplace(
+ gtasksList.copy(
+ icon = selectedIcon.value
+ )
+ )
localBroadcastManager.broadcastRefresh()
setResult(
Activity.RESULT_OK,
@@ -166,21 +170,22 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
private fun colorChanged() = selectedColor != gtasksList.color
- private fun iconChanged() = selectedIcon != gtasksList.getIcon()
+ private fun iconChanged() = selectedIcon.value != gtasksList.icon
private fun nameChanged() = newName != gtasksList.name
private suspend fun onListCreated(taskList: TaskList) {
- with(gtasksList) {
- uuid = taskList.id
- name = taskList.title
- color = selectedColor
- setIcon(selectedIcon)
- id = googleTaskListDao.insertOrReplace(this)
- }
+ val result = gtasksList.copy(
+ uuid = taskList.id,
+ name = taskList.title,
+ color = selectedColor,
+ icon = selectedIcon.value,
+ )
+ val id = googleTaskListDao.insertOrReplace(result)
setResult(
- Activity.RESULT_OK, Intent().putExtra(MainActivity.OPEN_FILTER, GtasksFilter(gtasksList)))
+ Activity.RESULT_OK,
+ Intent().putExtra(MainActivity.OPEN_FILTER, GtasksFilter(result.copy(id = id))))
finish()
}
@@ -197,17 +202,17 @@ class GoogleTaskListSettingsActivity : BaseListSettingsActivity() {
}
private suspend fun onListRenamed(taskList: TaskList) {
- with(gtasksList) {
- name = taskList.title
- color = selectedColor
- setIcon(selectedIcon)
- googleTaskListDao.insertOrReplace(this)
- }
+ val result = gtasksList.copy(
+ name = taskList.title,
+ color = selectedColor,
+ icon = selectedIcon.value,
+ )
+ googleTaskListDao.insertOrReplace(result)
setResult(
Activity.RESULT_OK,
Intent(TaskListFragment.ACTION_RELOAD)
- .putExtra(MainActivity.OPEN_FILTER, GtasksFilter(gtasksList)))
+ .putExtra(MainActivity.OPEN_FILTER, GtasksFilter(result)))
finish()
}
diff --git a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
index a2c515384..ac5333ce0 100644
--- a/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/PlaceSettingsActivity.kt
@@ -10,6 +10,7 @@ import com.google.android.material.textfield.TextInputLayout
import com.todoroo.astrid.activity.MainActivity
import com.todoroo.astrid.activity.TaskListFragment
import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.update
import org.tasks.LocalBroadcastManager
import org.tasks.R
import org.tasks.Strings.isNullOrEmpty
@@ -22,7 +23,7 @@ import org.tasks.extensions.formatNumber
import org.tasks.filters.PlaceFilter
import org.tasks.location.MapFragment
import org.tasks.preferences.Preferences
-import org.tasks.themes.CustomIcons
+import org.tasks.themes.TasksIcons
import java.util.Locale
import javax.inject.Inject
import kotlin.math.roundToInt
@@ -49,7 +50,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
@Inject lateinit var localBroadcastManager: LocalBroadcastManager
private lateinit var place: Place
- override val defaultIcon: Int = CustomIcons.PLACE
+ override val defaultIcon = TasksIcons.PLACE
override fun onCreate(savedInstanceState: Bundle?) {
if (intent?.hasExtra(EXTRA_PLACE) != true) {
@@ -69,7 +70,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
if (savedInstanceState == null) {
name.setText(place.displayName)
selectedColor = place.color
- selectedIcon = place.icon
+ selectedIcon.update { place.icon }
}
val dark = preferences.mapTheme == 2
@@ -106,7 +107,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
override fun hasChanges() = name.text.toString() != place.displayName
|| selectedColor != place.color
- || selectedIcon != place.icon
+ || selectedIcon.value != place.icon
override suspend fun save() {
val newName: String = name.text.toString()
@@ -119,7 +120,7 @@ class PlaceSettingsActivity : BaseListSettingsActivity(), MapFragment.MapFragmen
place = place.copy(
name = newName,
color = selectedColor,
- icon = selectedIcon,
+ icon = selectedIcon.value,
radius = slider.value.toInt(),
)
locationDao.update(place)
diff --git a/app/src/main/java/org/tasks/activities/TagSettingsActivity.kt b/app/src/main/java/org/tasks/activities/TagSettingsActivity.kt
index 51ea1c55c..856f8a663 100644
--- a/app/src/main/java/org/tasks/activities/TagSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/TagSettingsActivity.kt
@@ -15,8 +15,8 @@ import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout
import com.todoroo.astrid.activity.MainActivity
import com.todoroo.astrid.activity.TaskListFragment
-import org.tasks.filters.TagFilter
import dagger.hilt.android.AndroidEntryPoint
+import kotlinx.coroutines.flow.update
import org.tasks.LocalBroadcastManager
import org.tasks.R
import org.tasks.Strings.isNullOrEmpty
@@ -25,7 +25,8 @@ import org.tasks.data.dao.TagDataDao
import org.tasks.data.entity.TagData
import org.tasks.databinding.ActivityTagSettingsBinding
import org.tasks.extensions.Context.hideKeyboard
-import org.tasks.themes.CustomIcons
+import org.tasks.filters.TagFilter
+import org.tasks.themes.TasksIcons
import javax.inject.Inject
@AndroidEntryPoint
@@ -41,14 +42,14 @@ class TagSettingsActivity : BaseListSettingsActivity() {
private val isNewTag: Boolean
get() = tagData.id == null
- override val defaultIcon: Int = CustomIcons.LABEL
+ override val defaultIcon = TasksIcons.LABEL
override fun onCreate(savedInstanceState: Bundle?) {
tagData = intent.getParcelableExtra(EXTRA_TAG_DATA) ?: TagData()
super.onCreate(savedInstanceState)
if (savedInstanceState == null) {
selectedColor = tagData.color ?: 0
- selectedIcon = tagData.getIcon()!!
+ selectedIcon.update { tagData.icon }
}
name.setText(tagData.name)
if (isNewTag) {
@@ -88,7 +89,7 @@ class TagSettingsActivity : BaseListSettingsActivity() {
.copy(
name = newName,
color = selectedColor,
- icon = selectedIcon,
+ icon = selectedIcon.value,
)
.let { it.copy(id = tagDataDao.insert(it)) }
.let {
@@ -103,7 +104,7 @@ class TagSettingsActivity : BaseListSettingsActivity() {
.copy(
name = newName,
color = selectedColor,
- icon = selectedIcon,
+ icon = selectedIcon.value,
)
.let {
tagDataDao.update(it)
@@ -121,10 +122,10 @@ class TagSettingsActivity : BaseListSettingsActivity() {
override fun hasChanges(): Boolean {
return if (isNewTag) {
- selectedColor >= 0 || selectedIcon >= 0 || !isNullOrEmpty(newName)
+ selectedColor >= 0 || selectedIcon.value?.isBlank() == false || !isNullOrEmpty(newName)
} else {
selectedColor != (tagData.color ?: 0)
- || selectedIcon != tagData.getIcon()
+ || selectedIcon.value != tagData.icon
|| newName != tagData.name
}
}
diff --git a/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt b/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt
index b695e6a0f..005881eef 100644
--- a/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt
+++ b/app/src/main/java/org/tasks/backup/TasksJsonImporter.kt
@@ -7,6 +7,7 @@ import android.os.Handler
import com.todoroo.astrid.dao.TaskDao
import com.todoroo.astrid.service.TaskCreator.Companion.getDefaultAlarms
import com.todoroo.astrid.service.TaskMover
+import com.todoroo.astrid.service.Upgrade_13_11.Companion.migrateLegacyIcon
import com.todoroo.astrid.service.Upgrade_13_2
import com.todoroo.astrid.service.Upgrader
import com.todoroo.astrid.service.Upgrader.Companion.V12_4
@@ -99,7 +100,10 @@ class TasksJsonImporter @Inject constructor(
return@forEach
}
tagDataDao.insert(
- tagData.copy(color = themeToColor(context, version, tagData.color ?: 0))
+ tagData.copy(
+ color = themeToColor(context, version, tagData.color ?: 0),
+ icon = tagData.icon.migrateLegacyIcon(),
+ )
)
}
backupContainer.googleTaskAccounts?.forEach { googleTaskAccount ->
@@ -116,7 +120,11 @@ class TasksJsonImporter @Inject constructor(
}
backupContainer.places?.forEach { place ->
if (locationDao.getByUid(place.uid!!) == null) {
- locationDao.insert(place)
+ locationDao.insert(
+ place.copy(
+ icon = place.icon.migrateLegacyIcon(),
+ )
+ )
}
}
backupContainer.googleTaskLists?.forEach { googleTaskList ->
@@ -126,7 +134,7 @@ class TasksJsonImporter @Inject constructor(
account = googleTaskList.account,
uuid = googleTaskList.remoteId,
color = themeToColor(context, version, googleTaskList.color ?: 0),
-
+ icon = googleTaskList.icon?.toString().migrateLegacyIcon(),
)
)
}
@@ -139,7 +147,8 @@ class TasksJsonImporter @Inject constructor(
if (filterDao.getByName(filter.title!!) == null) {
filterDao.insert(
filter.copy(
- color = themeToColor(context, version, filter.color ?: 0)
+ color = themeToColor(context, version, filter.color ?: 0),
+ icon = filter.icon.migrateLegacyIcon(),
)
)
}
@@ -152,7 +161,10 @@ class TasksJsonImporter @Inject constructor(
backupContainer.caldavCalendars?.forEach { calendar ->
if (caldavDao.getCalendarByUuid(calendar.uuid!!) == null) {
caldavDao.insert(
- calendar.copy(color = themeToColor(context, version, calendar.color))
+ calendar.copy(
+ color = themeToColor(context, version, calendar.color),
+ icon = calendar.icon.migrateLegacyIcon(),
+ )
)
}
}
diff --git a/app/src/main/java/org/tasks/billing/PurchaseActivity.kt b/app/src/main/java/org/tasks/billing/PurchaseActivity.kt
index 72917c573..2f9a7bb7a 100644
--- a/app/src/main/java/org/tasks/billing/PurchaseActivity.kt
+++ b/app/src/main/java/org/tasks/billing/PurchaseActivity.kt
@@ -47,9 +47,11 @@ class PurchaseActivity : AppCompatActivity(), OnPurchasesUpdated {
theme.applyToContext(this)
- savedInstanceState?.let {
- nameYourPrice.value = it.getBoolean(EXTRA_NAME_YOUR_PRICE)
- sliderPosition.value = it.getFloat(EXTRA_PRICE)
+ if (savedInstanceState == null) {
+ nameYourPrice.value = intent?.extras?.getBoolean(EXTRA_NAME_YOUR_PRICE) ?: false
+ } else {
+ nameYourPrice.value = savedInstanceState.getBoolean(EXTRA_NAME_YOUR_PRICE)
+ sliderPosition.value = savedInstanceState.getFloat(EXTRA_PRICE)
}
setContent {
@@ -128,6 +130,6 @@ class PurchaseActivity : AppCompatActivity(), OnPurchasesUpdated {
companion object {
const val EXTRA_GITHUB = "extra_github"
private const val EXTRA_PRICE = "extra_price"
- private const val EXTRA_NAME_YOUR_PRICE = "extra_name_your_price"
+ const val EXTRA_NAME_YOUR_PRICE = "extra_name_your_price"
}
}
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt
index 4ffd45f29..0f8c5995c 100644
--- a/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/caldav/BaseCaldavCalendarSettingsActivity.kt
@@ -15,19 +15,20 @@ import com.google.android.material.textfield.TextInputEditText
import com.google.android.material.textfield.TextInputLayout
import com.todoroo.astrid.activity.MainActivity
import com.todoroo.astrid.activity.TaskListFragment
-import org.tasks.filters.CaldavFilter
-import org.tasks.data.UUIDHelper
import com.todoroo.astrid.service.TaskDeleter
+import kotlinx.coroutines.flow.update
import kotlinx.coroutines.runBlocking
import org.tasks.R
import org.tasks.Strings.isNullOrEmpty
import org.tasks.activities.BaseListSettingsActivity
+import org.tasks.data.UUIDHelper
+import org.tasks.data.dao.CaldavDao
import org.tasks.data.entity.CaldavAccount
import org.tasks.data.entity.CaldavCalendar
-import org.tasks.data.dao.CaldavDao
import org.tasks.databinding.ActivityCaldavCalendarSettingsBinding
import org.tasks.extensions.Context.hideKeyboard
-import org.tasks.themes.CustomIcons
+import org.tasks.filters.CaldavFilter
+import org.tasks.themes.TasksIcons
import org.tasks.ui.DisplayableException
import java.net.ConnectException
import javax.inject.Inject
@@ -44,7 +45,7 @@ abstract class BaseCaldavCalendarSettingsActivity : BaseListSettingsActivity() {
protected var caldavCalendar: CaldavCalendar? = null
protected lateinit var caldavAccount: CaldavAccount
- override val defaultIcon: Int = CustomIcons.LIST
+ override val defaultIcon = TasksIcons.LIST
override fun bind() = ActivityCaldavCalendarSettingsBinding.inflate(layoutInflater).let {
root = it.rootLayout
@@ -71,7 +72,7 @@ abstract class BaseCaldavCalendarSettingsActivity : BaseListSettingsActivity() {
if (caldavCalendar != null) {
name.setText(caldavCalendar!!.name)
selectedColor = caldavCalendar!!.color
- selectedIcon = caldavCalendar!!.getIcon()!!
+ selectedIcon.update { caldavCalendar?.icon }
}
}
if (caldavCalendar == null) {
@@ -165,7 +166,7 @@ abstract class BaseCaldavCalendarSettingsActivity : BaseListSettingsActivity() {
url = url,
name = newName,
color = selectedColor,
- icon = selectedIcon,
+ icon = selectedIcon.value,
)
caldavDao.insert(caldavCalendar)
setResult(
@@ -175,20 +176,22 @@ abstract class BaseCaldavCalendarSettingsActivity : BaseListSettingsActivity() {
}
protected suspend fun updateCalendar() {
- caldavCalendar!!.name = newName
- caldavCalendar!!.color = selectedColor
- caldavCalendar!!.setIcon(selectedIcon)
- caldavDao.update(caldavCalendar!!)
+ val result = caldavCalendar!!.copy(
+ name = newName,
+ color = selectedColor,
+ icon = selectedIcon.value,
+ )
+ caldavDao.update(result)
setResult(
Activity.RESULT_OK,
Intent(TaskListFragment.ACTION_RELOAD)
- .putExtra(MainActivity.OPEN_FILTER, CaldavFilter(caldavCalendar!!)))
+ .putExtra(MainActivity.OPEN_FILTER, CaldavFilter(result)))
finish()
}
override fun hasChanges(): Boolean =
if (caldavCalendar == null)
- !isNullOrEmpty(newName) || selectedColor != 0 || selectedIcon != -1
+ !isNullOrEmpty(newName) || selectedColor != 0 || selectedIcon.value?.isBlank() == false
else
nameChanged() || iconChanged() || colorChanged()
@@ -196,7 +199,7 @@ abstract class BaseCaldavCalendarSettingsActivity : BaseListSettingsActivity() {
private fun colorChanged(): Boolean = selectedColor != caldavCalendar!!.color
- private fun iconChanged(): Boolean = selectedIcon != caldavCalendar!!.getIcon()
+ private fun iconChanged(): Boolean = selectedIcon.value != caldavCalendar!!.icon
private val newName: String
get() = name.text.toString().trim { it <= ' ' }
diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.kt b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.kt
index e3284f873..2716b32af 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarSettingsActivity.kt
@@ -116,7 +116,7 @@ class CaldavCalendarSettingsActivity : BaseCaldavCalendarSettingsActivity() {
}
override suspend fun createCalendar(caldavAccount: CaldavAccount, name: String, color: Int) {
- caldavCalendar = viewModel.createCalendar(caldavAccount, name, color, selectedIcon)
+ caldavCalendar = viewModel.createCalendar(caldavAccount, name, color, selectedIcon.value)
}
override suspend fun updateNameAndColor(
@@ -125,7 +125,7 @@ class CaldavCalendarSettingsActivity : BaseCaldavCalendarSettingsActivity() {
name: String,
color: Int
) {
- viewModel.updateCalendar(account, calendar, name, color, selectedIcon)
+ viewModel.updateCalendar(account, calendar, name, color, selectedIcon.value)
}
override suspend fun deleteCalendar(
diff --git a/app/src/main/java/org/tasks/caldav/CaldavCalendarViewModel.kt b/app/src/main/java/org/tasks/caldav/CaldavCalendarViewModel.kt
index f330df7ca..a2e3bc6e6 100644
--- a/app/src/main/java/org/tasks/caldav/CaldavCalendarViewModel.kt
+++ b/app/src/main/java/org/tasks/caldav/CaldavCalendarViewModel.kt
@@ -3,19 +3,19 @@ package org.tasks.caldav
import android.content.Intent
import com.todoroo.astrid.activity.MainActivity
import com.todoroo.astrid.activity.TaskListFragment
-import org.tasks.filters.CaldavFilter
-import org.tasks.data.UUIDHelper
import com.todoroo.astrid.service.TaskDeleter
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.withContext
-import org.tasks.data.*
-import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE
-import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_UNKNOWN
+import org.tasks.data.PrincipalWithAccess
+import org.tasks.data.UUIDHelper
import org.tasks.data.dao.CaldavDao
import org.tasks.data.dao.PrincipalDao
import org.tasks.data.entity.CaldavAccount
import org.tasks.data.entity.CaldavCalendar
+import org.tasks.data.entity.CaldavCalendar.Companion.ACCESS_READ_WRITE
+import org.tasks.data.entity.CaldavCalendar.Companion.INVITE_UNKNOWN
+import org.tasks.filters.CaldavFilter
import org.tasks.sync.SyncAdapters
import javax.inject.Inject
@@ -33,7 +33,7 @@ class CaldavCalendarViewModel @Inject constructor(
caldavAccount: CaldavAccount,
name: String,
color: Int,
- icon: Int
+ icon: String?
): CaldavCalendar? =
doRequest {
val url = withContext(Dispatchers.IO) {
@@ -60,20 +60,20 @@ class CaldavCalendarViewModel @Inject constructor(
calendar: CaldavCalendar,
name: String,
color: Int,
- icon: Int
+ icon: String?
) =
doRequest {
withContext(Dispatchers.IO) {
provider.forAccount(account, calendar.url!!).updateCollection(name, color)
}
- calendar.apply {
- this.name = name
- this.color = color
- setIcon(icon)
- caldavDao.update(this)
- }
+ val result = calendar.copy(
+ name = name,
+ color = color,
+ icon = icon,
+ )
+ caldavDao.update(result)
finish.value = Intent(TaskListFragment.ACTION_RELOAD)
- .putExtra(MainActivity.OPEN_FILTER, CaldavFilter(calendar))
+ .putExtra(MainActivity.OPEN_FILTER, CaldavFilter(result))
}
suspend fun deleteCalendar(account: CaldavAccount, calendar: CaldavCalendar) =
diff --git a/app/src/main/java/org/tasks/compose/Chip.kt b/app/src/main/java/org/tasks/compose/Chip.kt
index 947f680e6..e51c3f924 100644
--- a/app/src/main/java/org/tasks/compose/Chip.kt
+++ b/app/src/main/java/org/tasks/compose/Chip.kt
@@ -1,7 +1,6 @@
package org.tasks.compose
import android.content.res.Configuration
-import androidx.annotation.DrawableRes
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.defaultMinSize
@@ -21,18 +20,18 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.tasks.R
-import org.tasks.themes.CustomIcons
+import org.tasks.compose.components.imageVectorByName
+import org.tasks.themes.TasksIcons
import org.tasks.themes.TasksTheme
@Composable
fun Chip(
- @DrawableRes icon: Int?,
+ icon: String?,
name: String?,
theme: Int,
showText: Boolean,
@@ -54,7 +53,7 @@ fun Chip(
@Composable
fun Chip(
text: String? = null,
- icon: Int? = null,
+ icon: String? = null,
color: Color,
onClick: () -> Unit = {},
clear: (() -> Unit)? = null,
@@ -68,7 +67,7 @@ fun Chip(
border = BorderStroke(1.dp, color = color),
leadingIcon = {
if (text != null) {
- ChipIcon(iconRes = icon)
+ ChipIcon(icon = icon)
}
},
trailingIcon = {
@@ -90,7 +89,7 @@ fun Chip(
),
label = {
if (text == null) {
- ChipIcon(iconRes = icon)
+ ChipIcon(icon = icon)
}
text?.let {
Text(
@@ -106,10 +105,10 @@ fun Chip(
}
@Composable
-private fun ChipIcon(iconRes: Int?) {
- iconRes?.let {
+private fun ChipIcon(icon: String?) {
+ icon?.let {
Icon(
- painter = painterResource(id = iconRes),
+ imageVector = imageVectorByName(it) ?: return@let,
contentDescription = null,
modifier = Modifier.size(18.dp)
)
@@ -124,7 +123,7 @@ fun TasksChipIconAndTextPreview() {
TasksTheme {
Chip(
text = "Home",
- icon = CustomIcons.getIconResId(CustomIcons.LABEL),
+ icon = TasksIcons.LABEL,
color = Color.Red,
)
}
@@ -138,7 +137,7 @@ fun TasksChipIconTextAndClearPreview() {
TasksTheme {
Chip(
text = "Home",
- icon = CustomIcons.getIconResId(CustomIcons.LABEL),
+ icon = TasksIcons.LABEL,
color = Color.Red,
clear = {},
)
@@ -153,7 +152,7 @@ fun TasksChipIconPreview() {
TasksTheme {
Chip(
text = null,
- icon = CustomIcons.getIconResId(CustomIcons.LABEL),
+ icon = TasksIcons.LABEL,
color = Color.Red,
)
}
diff --git a/app/src/main/java/org/tasks/compose/FilterChip.kt b/app/src/main/java/org/tasks/compose/FilterChip.kt
index d3d726e63..e80e6991e 100644
--- a/app/src/main/java/org/tasks/compose/FilterChip.kt
+++ b/app/src/main/java/org/tasks/compose/FilterChip.kt
@@ -2,19 +2,18 @@ package org.tasks.compose
import androidx.compose.runtime.Composable
import org.tasks.filters.Filter
-import org.tasks.themes.CustomIcons
@Composable
fun FilterChip(
filter: Filter,
- defaultIcon: Int,
+ defaultIcon: String,
showText: Boolean,
showIcon: Boolean,
onClick: (Filter) -> Unit,
colorProvider: (Int) -> Int,
) {
Chip(
- CustomIcons.getIcon(filter.icon, defaultIcon),
+ filter.icon ?: defaultIcon,
filter.title,
filter.tint,
showText,
diff --git a/app/src/main/java/org/tasks/compose/FilterSelectionActivity.kt b/app/src/main/java/org/tasks/compose/FilterSelectionActivity.kt
index 288406a80..668eab8cb 100644
--- a/app/src/main/java/org/tasks/compose/FilterSelectionActivity.kt
+++ b/app/src/main/java/org/tasks/compose/FilterSelectionActivity.kt
@@ -21,8 +21,6 @@ import androidx.compose.runtime.derivedStateOf
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.unit.dp
import androidx.core.content.IntentCompat
import androidx.fragment.app.Fragment
@@ -30,6 +28,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
import androidx.lifecycle.viewmodel.compose.viewModel
import dagger.hilt.android.AndroidEntryPoint
import org.tasks.LocalBroadcastManager
+import org.tasks.compose.components.imageVectorByName
import org.tasks.compose.pickers.SearchableFilterPicker
import org.tasks.dialogs.FilterPickerViewModel
import org.tasks.filters.Filter
@@ -76,7 +75,7 @@ class FilterSelectionActivity : AppCompatActivity() {
filters = if (searching) state.searchResults else state.filters,
query = state.query,
onQueryChange = { viewModel.onQueryChange(it) },
- getIcon = { ImageVector.vectorResource(id = viewModel.getIcon(it)) },
+ getIcon = { imageVectorByName(viewModel.getIcon(it))!! },
getColor = { viewModel.getColor(it) },
selected = selected,
onClick = { filter ->
diff --git a/app/src/main/java/org/tasks/compose/IconPickerActivity.kt b/app/src/main/java/org/tasks/compose/IconPickerActivity.kt
new file mode 100644
index 000000000..608186a74
--- /dev/null
+++ b/app/src/main/java/org/tasks/compose/IconPickerActivity.kt
@@ -0,0 +1,99 @@
+package org.tasks.compose
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AppCompatActivity
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.BasicAlertDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.compose.LifecycleEventEffect
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import androidx.lifecycle.viewmodel.compose.viewModel
+import dagger.hilt.android.AndroidEntryPoint
+import org.tasks.billing.Inventory
+import org.tasks.billing.PurchaseActivity
+import org.tasks.billing.PurchaseActivity.Companion.EXTRA_NAME_YOUR_PRICE
+import org.tasks.compose.pickers.IconPicker
+import org.tasks.compose.pickers.IconPickerViewModel
+import org.tasks.themes.TasksTheme
+import javax.inject.Inject
+
+@AndroidEntryPoint
+class IconPickerActivity : AppCompatActivity() {
+ @Inject lateinit var inventory: Inventory
+
+ @OptIn(ExperimentalMaterial3Api::class)
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ setContent {
+ TasksTheme {
+ var hasPro by remember { mutableStateOf(false) }
+ LifecycleEventEffect(Lifecycle.Event.ON_RESUME) {
+ hasPro = inventory.hasPro
+ }
+ val viewModel: IconPickerViewModel = viewModel()
+ val searchResults = viewModel.searchResults.collectAsStateWithLifecycle().value
+ val state = viewModel.viewState.collectAsStateWithLifecycle().value
+ BasicAlertDialog(
+ onDismissRequest = { finish() },
+ modifier = Modifier.padding(vertical = 32.dp)
+ ) {
+ IconPicker(
+ icons = state.icons,
+ query = state.query,
+ searchResults = searchResults,
+ collapsed = state.collapsed,
+ onQueryChange = { viewModel.onQueryChange(it) },
+ onSelected = {
+ setResult(RESULT_OK, Intent().putExtra(EXTRA_SELECTED, it.name))
+ finish()
+ },
+ toggleCollapsed = { category, collapsed ->
+ viewModel.setCollapsed(category, collapsed)
+ },
+ hasPro = hasPro,
+ subscribe = {
+ startActivity(
+ Intent(this, PurchaseActivity::class.java)
+ .putExtra(EXTRA_NAME_YOUR_PRICE, true)
+ )
+ },
+ )
+ }
+ }
+ }
+ }
+
+ companion object {
+ const val EXTRA_SELECTED = "extra_selected"
+ const val EXTRA_ICON = "extra_icon"
+
+ fun ComponentActivity.registerForIconPickerResult(callback: (String) -> Unit): ActivityResultLauncher {
+ return registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+ it.data?.getStringExtra(EXTRA_SELECTED)?.let(callback)
+ }
+ }
+
+ fun ActivityResultLauncher.launchIconPicker(
+ context: Context,
+ selected: String? = null,
+ ) {
+ launch(
+ Intent(context, IconPickerActivity::class.java)
+ .putExtra(EXTRA_SELECTED, selected)
+ )
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/tasks/compose/StartDateChip.kt b/app/src/main/java/org/tasks/compose/StartDateChip.kt
index d2e6e1847..c5885ad9a 100644
--- a/app/src/main/java/org/tasks/compose/StartDateChip.kt
+++ b/app/src/main/java/org/tasks/compose/StartDateChip.kt
@@ -6,9 +6,9 @@ import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import com.todoroo.andlib.utility.DateUtilities
-import org.tasks.R
import org.tasks.data.entity.Task
import org.tasks.date.DateTimeUtils.toDateTime
+import org.tasks.themes.TasksIcons
import org.tasks.time.startOfDay
import java.time.format.FormatStyle
@@ -44,7 +44,7 @@ fun StartDateChip(
}
if (text != null) {
Chip(
- icon = R.drawable.ic_pending_actions_24px,
+ icon = TasksIcons.PENDING_ACTIONS,
name = text,
theme = 0,
showText = true,
diff --git a/app/src/main/java/org/tasks/compose/Subscription.kt b/app/src/main/java/org/tasks/compose/Subscription.kt
index 4c2fa2b1d..1811cea70 100644
--- a/app/src/main/java/org/tasks/compose/Subscription.kt
+++ b/app/src/main/java/org/tasks/compose/Subscription.kt
@@ -245,12 +245,7 @@ object PurchaseText {
}
}) {
Text(
- text = stringResource(
- if (nameYourPrice.value)
- R.string.back
- else
- R.string.more_options
- ),
+ text = stringResource(R.string.more_options),
color = if (solidButton)
MaterialTheme.colorScheme.onSecondary
else
@@ -414,7 +409,7 @@ object PurchaseText {
) {
PurchaseButton(
price = sliderPosition.value.toInt(),
- popperText = if (sliderPosition.value.toInt() >= 5)
+ popperText = if (sliderPosition.value.toInt() >= 7)
"${stringResource(R.string.above_average, 16)} $POPPER"
else
"",
diff --git a/app/src/main/java/org/tasks/compose/SubtaskChip.kt b/app/src/main/java/org/tasks/compose/SubtaskChip.kt
index 063cd2ff4..4126233f9 100644
--- a/app/src/main/java/org/tasks/compose/SubtaskChip.kt
+++ b/app/src/main/java/org/tasks/compose/SubtaskChip.kt
@@ -4,6 +4,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import org.tasks.R
+import org.tasks.themes.TasksIcons
import java.text.NumberFormat
@Composable
@@ -16,9 +17,9 @@ fun SubtaskChip(
val context = LocalContext.current
Chip(
icon = if (collapsed)
- R.drawable.ic_keyboard_arrow_down_black_24dp
+ TasksIcons.KEYBOARD_ARROW_DOWN
else
- R.drawable.ic_keyboard_arrow_up_black_24dp,
+ TasksIcons.KEYBOARD_ARROW_UP,
name = if (compact)
NumberFormat.getInstance().format(children)
else
diff --git a/app/src/main/java/org/tasks/compose/drawer/DrawerItem.kt b/app/src/main/java/org/tasks/compose/drawer/DrawerItem.kt
index d107f0e80..b699d770c 100644
--- a/app/src/main/java/org/tasks/compose/drawer/DrawerItem.kt
+++ b/app/src/main/java/org/tasks/compose/drawer/DrawerItem.kt
@@ -5,7 +5,7 @@ import org.tasks.filters.NavigationDrawerSubheader
sealed interface DrawerItem {
data class Filter(
val title: String,
- val icon: Int,
+ val icon: String,
val color: Int = 0,
val count: Int = 0,
val shareCount: Int = 0,
diff --git a/app/src/main/java/org/tasks/compose/drawer/TaskListDrawer.kt b/app/src/main/java/org/tasks/compose/drawer/TaskListDrawer.kt
index 2016df31b..9bcb64ce1 100644
--- a/app/src/main/java/org/tasks/compose/drawer/TaskListDrawer.kt
+++ b/app/src/main/java/org/tasks/compose/drawer/TaskListDrawer.kt
@@ -3,9 +3,7 @@ package org.tasks.compose.drawer
import android.content.res.Configuration
import androidx.compose.animation.animateContentSize
import androidx.compose.animation.core.Spring
-import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.spring
-import androidx.compose.animation.core.tween
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
@@ -29,7 +27,6 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.HelpOutline
import androidx.compose.material.icons.outlined.Add
import androidx.compose.material.icons.outlined.AttachMoney
-import androidx.compose.material.icons.outlined.ExpandMore
import androidx.compose.material.icons.outlined.PeopleOutline
import androidx.compose.material.icons.outlined.PermIdentity
import androidx.compose.material.icons.outlined.Settings
@@ -47,21 +44,22 @@ import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.rotate
import androidx.compose.ui.focus.onFocusChanged
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalConfiguration
-import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import kotlinx.collections.immutable.ImmutableList
import kotlinx.collections.immutable.persistentListOf
import org.tasks.R
+import org.tasks.compose.components.Chevron
import org.tasks.compose.components.SearchBar
+import org.tasks.compose.components.imageVectorByName
import org.tasks.extensions.formatNumber
import org.tasks.filters.FilterImpl
import org.tasks.filters.NavigationDrawerSubheader
+import org.tasks.themes.TasksIcons
import org.tasks.themes.TasksTheme
@Composable
@@ -184,9 +182,7 @@ internal fun FilterItem(
.clickable(onClick = onClick),
onClick = onClick,
) {
- if (item.icon != -1) {
- DrawerIcon(icon = item.icon, color = item.color)
- }
+ DrawerIcon(icon = item.icon, color = item.color)
Spacer(modifier = Modifier.width(16.dp))
Text(
text = item.title,
@@ -219,27 +215,10 @@ internal fun FilterItem(
}
@Composable
-private fun MenuAction(
- icon: Int,
- title: Int,
- onClick: () -> Unit,
-) {
- MenuRow(onClick = onClick) {
- DrawerIcon(icon = icon)
- Spacer(modifier = Modifier.width(16.dp))
- Text(
- text = stringResource(id = title),
- color = MaterialTheme.colorScheme.onSurface,
- modifier = Modifier.weight(1f),
- )
- }
-}
-
-@Composable
-private fun DrawerIcon(icon: Int, color: Int = 0) {
+private fun DrawerIcon(icon: String, color: Int = 0) {
Icon(
modifier = Modifier.size(24.dp),
- painter = painterResource(id = icon),
+ imageVector = imageVectorByName(icon) ?: return,
contentDescription = null,
tint = when (color) {
0 -> MaterialTheme.colorScheme.onSurface
@@ -268,17 +247,7 @@ internal fun HeaderItem(
color = MaterialTheme.colorScheme.onSurface,
)
IconButton(onClick = toggleCollapsed) {
- val rotation by animateFloatAsState(
- targetValue = if (item.collapsed) 0f else 180f,
- animationSpec = tween(250),
- label = "arrow rotation",
- )
- Icon(
- modifier = Modifier.rotate(rotation),
- imageVector = Icons.Outlined.ExpandMore,
- contentDescription = null,
- tint = MaterialTheme.colorScheme.onSurface,
- )
+ Chevron(item.collapsed)
}
if (canAdd) {
IconButton(onClick = onAddClick) {
@@ -330,7 +299,7 @@ fun MenuPreview() {
filters = persistentListOf(
DrawerItem.Filter(
title = "My Tasks",
- icon = R.drawable.ic_outline_all_inbox_24px,
+ icon = TasksIcons.ALL_INBOX,
type = { FilterImpl() },
),
DrawerItem.Header(
diff --git a/app/src/main/java/org/tasks/compose/edit/ListRow.kt b/app/src/main/java/org/tasks/compose/edit/ListRow.kt
index f9cab8658..13a06b229 100644
--- a/app/src/main/java/org/tasks/compose/edit/ListRow.kt
+++ b/app/src/main/java/org/tasks/compose/edit/ListRow.kt
@@ -13,6 +13,7 @@ import org.tasks.compose.FilterChip
import org.tasks.compose.TaskEditRow
import org.tasks.filters.Filter
import org.tasks.filters.FilterImpl
+import org.tasks.themes.TasksIcons
import org.tasks.themes.TasksTheme
@Composable
@@ -28,7 +29,7 @@ fun ListRow(
if (list != null) {
FilterChip(
filter = list,
- defaultIcon = R.drawable.ic_list_24px,
+ defaultIcon = TasksIcons.LIST,
showText = true,
showIcon = true,
onClick = { onClick() },
diff --git a/app/src/main/java/org/tasks/compose/edit/TagsRow.kt b/app/src/main/java/org/tasks/compose/edit/TagsRow.kt
index 3168657fd..330f428f4 100644
--- a/app/src/main/java/org/tasks/compose/edit/TagsRow.kt
+++ b/app/src/main/java/org/tasks/compose/edit/TagsRow.kt
@@ -2,6 +2,8 @@ package org.tasks.compose.edit
import android.content.res.Configuration
import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.outlined.Home
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
@@ -14,7 +16,7 @@ import org.tasks.compose.DisabledText
import org.tasks.compose.TaskEditRow
import org.tasks.data.entity.TagData
import org.tasks.themes.ColorProvider
-import org.tasks.themes.CustomIcons
+import org.tasks.themes.TasksIcons
import org.tasks.themes.TasksTheme
@Composable
@@ -33,10 +35,7 @@ fun TagsRow(
} else {
tags.sortedBy(TagData::name).forEach { tag ->
Chip(
- icon = CustomIcons.getIcon(
- tag.getIcon()!!,
- R.drawable.ic_outline_label_24px
- ),
+ icon = tag.icon ?: TasksIcons.LABEL,
name = tag.name,
theme = tag.color ?: 0,
showText = true,
@@ -76,7 +75,7 @@ fun SingleTag() {
tags = listOf(
TagData(
name = "Home",
- icon = 1062,
+ icon = Icons.Outlined.Home.name,
color = ColorProvider.BLUE_500
)
),
@@ -114,7 +113,7 @@ fun TagWithReallyLongName() {
tags = listOf(
TagData(
name = "This is a tag with a really really long name",
- icon = 1062,
+ icon = Icons.Outlined.Home.name,
color = ColorProvider.BLUE_500
)
),
diff --git a/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt b/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt
index a8b14e5a0..2580064c7 100644
--- a/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt
+++ b/app/src/main/java/org/tasks/dialogs/FilterPickerViewModel.kt
@@ -22,9 +22,9 @@ import org.tasks.filters.Filter
import org.tasks.filters.FilterListItem
import org.tasks.filters.FilterProvider
import org.tasks.filters.NavigationDrawerSubheader
+import org.tasks.filters.getIcon
import org.tasks.preferences.Preferences
import org.tasks.themes.ColorProvider
-import org.tasks.themes.CustomIcons
import javax.inject.Inject
@HiltViewModel
@@ -90,15 +90,7 @@ class FilterPickerViewModel @Inject constructor(
localBroadcastManager.broadcastRefreshList()
}
- fun getIcon(filter: Filter): Int {
- if (filter.icon < 1000 || inventory.hasPro) {
- val icon = CustomIcons.getIconResId(filter.icon)
- if (icon != null) {
- return icon
- }
- }
- return R.drawable.ic_list_24px
- }
+ fun getIcon(filter: Filter): String = filter.getIcon(inventory)
fun getColor(filter: Filter): Int {
if (filter.tint != 0) {
diff --git a/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java b/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java
deleted file mode 100644
index bf095152a..000000000
--- a/app/src/main/java/org/tasks/dialogs/IconPickerAdapter.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package org.tasks.dialogs;
-
-import static org.tasks.preferences.ResourceResolver.getData;
-
-import android.app.Activity;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.core.content.res.ResourcesCompat;
-import androidx.recyclerview.widget.DiffUtil.ItemCallback;
-import androidx.recyclerview.widget.ListAdapter;
-
-import org.tasks.Callback;
-import org.tasks.R;
-import org.tasks.billing.Inventory;
-import org.tasks.databinding.DialogIconPickerCellBinding;
-import org.tasks.themes.CustomIcons;
-
-class IconPickerAdapter extends ListAdapter {
-
- private final Activity activity;
- private final Inventory inventory;
- private final int current;
- private final Callback onSelected;
-
- IconPickerAdapter(
- Activity activity, Inventory inventory, int current, Callback onSelected) {
- super(new DiffCallback());
- this.activity = activity;
- this.inventory = inventory;
- this.current = current;
- this.onSelected = onSelected;
- }
-
- @NonNull
- @Override
- public IconPickerHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
- return new IconPickerHolder(
- activity,
- DialogIconPickerCellBinding.inflate(activity.getLayoutInflater(), parent, false),
- onSelected);
- }
-
- @Override
- public void onBindViewHolder(@NonNull IconPickerHolder holder, int position) {
- int index = CustomIcons.getIndex(position);
- Integer icon = CustomIcons.getIconResId(index);
- if (icon != null) {
- int tint = index == current
- ? getData(activity, androidx.appcompat.R.attr.colorAccent)
- : activity.getColor(R.color.icon_tint);
- boolean available = index < 1000 || inventory.getHasPro();
- float alpha =
- ResourcesCompat.getFloat(
- activity.getResources(),
- available ? R.dimen.alpha_primary : R.dimen.alpha_disabled);
- holder.bind(index, icon, tint, alpha, available);
- }
- }
-
- private static class DiffCallback extends ItemCallback {
- @Override
- public boolean areItemsTheSame(@NonNull Integer oldItem, @NonNull Integer newItem) {
- return oldItem.equals(newItem);
- }
-
- @Override
- public boolean areContentsTheSame(@NonNull Integer oldItem, @NonNull Integer newItem) {
- return true;
- }
- }
-}
diff --git a/app/src/main/java/org/tasks/dialogs/IconPickerDialog.java b/app/src/main/java/org/tasks/dialogs/IconPickerDialog.java
deleted file mode 100644
index 11255f2b7..000000000
--- a/app/src/main/java/org/tasks/dialogs/IconPickerDialog.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package org.tasks.dialogs;
-
-import android.app.Activity;
-import android.app.Dialog;
-import android.content.DialogInterface;
-import android.content.Intent;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.recyclerview.widget.RecyclerView;
-
-import org.tasks.R;
-import org.tasks.billing.Inventory;
-import org.tasks.billing.PurchaseActivity;
-import org.tasks.databinding.DialogIconPickerBinding;
-import org.tasks.themes.CustomIcons;
-
-import javax.inject.Inject;
-
-import dagger.hilt.android.AndroidEntryPoint;
-
-@AndroidEntryPoint
-public class IconPickerDialog extends DialogFragment {
-
- private static final String EXTRA_CURRENT = "extra_current";
-
- @Inject DialogBuilder dialogBuilder;
- @Inject Activity context;
- @Inject Inventory inventory;
- private IconPickerCallback callback;
-
- public static IconPickerDialog newIconPicker(int currentIcon) {
- IconPickerDialog dialog = new IconPickerDialog();
- Bundle args = new Bundle();
- args.putInt(EXTRA_CURRENT, currentIcon);
- dialog.setArguments(args);
- return dialog;
- }
-
- @NonNull
- @Override
- public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
- DialogIconPickerBinding binding = DialogIconPickerBinding.inflate(LayoutInflater.from(context));
- Bundle arguments = getArguments();
- int current = arguments.getInt(EXTRA_CURRENT);
-
- IconPickerAdapter iconPickerAdapter =
- new IconPickerAdapter(context, inventory, current, this::onSelected);
- RecyclerView recyclerView = binding.icons;
- recyclerView.setLayoutManager(new IconLayoutManager(context));
- recyclerView.setAdapter(iconPickerAdapter);
-
- iconPickerAdapter.submitList(CustomIcons.getIconList());
-
- AlertDialogBuilder builder =
- dialogBuilder
- .newDialog()
- .setNegativeButton(R.string.cancel, null)
- .setView(binding.getRoot());
- if (!inventory.getHasPro()) {
- builder.setPositiveButton(
- R.string.upgrade_to_pro,
- (dialog, which) -> startActivity(new Intent(getContext(), PurchaseActivity.class))
- );
- }
- return builder.show();
- }
-
- @Override
- public void onAttach(Activity activity) {
- super.onAttach(activity);
-
- callback = (IconPickerCallback) activity;
- }
-
- private void onSelected(int index) {
- callback.onSelected(getDialog(), index);
- }
-
- public interface IconPickerCallback {
- void onSelected(DialogInterface d, int icon);
- }
-}
diff --git a/app/src/main/java/org/tasks/filters/FilterExtensions.kt b/app/src/main/java/org/tasks/filters/FilterExtensions.kt
new file mode 100644
index 000000000..c7313428f
--- /dev/null
+++ b/app/src/main/java/org/tasks/filters/FilterExtensions.kt
@@ -0,0 +1,20 @@
+package org.tasks.filters
+
+import com.todoroo.astrid.api.CustomFilter
+import org.tasks.billing.Inventory
+import org.tasks.themes.TasksIcons
+
+fun Filter.getIcon(inventory: Inventory): String {
+ if (inventory.hasPro) {
+ icon?.takeIf { it.isNotBlank() }?.let { return it }
+ }
+ return when (this) {
+ is TagFilter -> TasksIcons.LABEL
+ is GtasksFilter,
+ is CaldavFilter -> TasksIcons.LIST
+
+ is CustomFilter -> TasksIcons.FILTER_LIST
+ is PlaceFilter -> TasksIcons.PLACE
+ else -> icon!!
+ }
+}
diff --git a/app/src/main/java/org/tasks/filters/NotificationsFilter.kt b/app/src/main/java/org/tasks/filters/NotificationsFilter.kt
index 084b5d7d6..9e8639f0e 100644
--- a/app/src/main/java/org/tasks/filters/NotificationsFilter.kt
+++ b/app/src/main/java/org/tasks/filters/NotificationsFilter.kt
@@ -1,18 +1,19 @@
package org.tasks.filters
-import org.tasks.data.sql.Join
-import org.tasks.data.sql.QueryTemplate
-import org.tasks.data.entity.Task
import kotlinx.parcelize.Parcelize
-import org.tasks.R
import org.tasks.data.entity.Notification
+import org.tasks.data.entity.Task
+import org.tasks.data.sql.Join
+import org.tasks.data.sql.QueryTemplate
+import org.tasks.themes.TasksIcons
@Parcelize
data class NotificationsFilter(
override val title: String,
) : Filter {
- override val icon: Int
- get() = R.drawable.ic_outline_notifications_24px
+ override val icon: String
+ get() = TasksIcons.NOTIFICATIONS
+
override val sql: String
get() = QueryTemplate()
.join(Join.inner(Notification.TABLE, Task.ID.eq(Notification.TASK)))
diff --git a/app/src/main/java/org/tasks/filters/PlaceFilter.kt b/app/src/main/java/org/tasks/filters/PlaceFilter.kt
index 91bc74eb5..dcab6f92a 100644
--- a/app/src/main/java/org/tasks/filters/PlaceFilter.kt
+++ b/app/src/main/java/org/tasks/filters/PlaceFilter.kt
@@ -13,7 +13,7 @@ import org.tasks.data.sql.Criterion.Companion.and
import org.tasks.data.sql.Field.Companion.field
import org.tasks.data.sql.Join.Companion.inner
import org.tasks.data.sql.QueryTemplate
-import org.tasks.themes.CustomIcons
+import org.tasks.themes.TasksIcons
@Parcelize
data class PlaceFilter(
@@ -32,8 +32,9 @@ data class PlaceFilter(
override val order: Int
get() = place.order
- override val icon: Int
- get() = place.icon.takeIf { it != -1 } ?: CustomIcons.PLACE
+ override val icon: String
+ get() = place.icon?.takeIf { it.isNotBlank() } ?: TasksIcons.PLACE
+
override val title: String
get() = place.displayName
override val tint: Int
diff --git a/app/src/main/java/org/tasks/filters/SnoozedFilter.kt b/app/src/main/java/org/tasks/filters/SnoozedFilter.kt
index f60f16a9a..09f5414c9 100644
--- a/app/src/main/java/org/tasks/filters/SnoozedFilter.kt
+++ b/app/src/main/java/org/tasks/filters/SnoozedFilter.kt
@@ -6,16 +6,16 @@ import org.tasks.data.sql.Join.Companion.inner
import org.tasks.data.sql.QueryTemplate
import org.tasks.data.entity.Task
import kotlinx.parcelize.Parcelize
-import org.tasks.R
import org.tasks.data.entity.Alarm
import org.tasks.data.dao.TaskDao.TaskCriteria.activeAndVisible
+import org.tasks.themes.TasksIcons
@Parcelize
data class SnoozedFilter(
override val title: String,
) : Filter {
- override val icon: Int
- get() = R.drawable.ic_snooze_white_24dp
+ override val icon: String
+ get() = TasksIcons.SNOOZE
override val sql: String
get() = QueryTemplate()
diff --git a/app/src/main/java/org/tasks/filters/TimerFilter.kt b/app/src/main/java/org/tasks/filters/TimerFilter.kt
index e0fb0400f..fa3ce3774 100644
--- a/app/src/main/java/org/tasks/filters/TimerFilter.kt
+++ b/app/src/main/java/org/tasks/filters/TimerFilter.kt
@@ -4,12 +4,12 @@ import org.tasks.data.sql.Criterion
import org.tasks.data.sql.QueryTemplate
import org.tasks.data.entity.Task
import kotlinx.parcelize.Parcelize
-import org.tasks.R
+import org.tasks.themes.TasksIcons
@Parcelize
data class TimerFilter(override val title: String?) : Filter {
override val icon
- get() = R.drawable.ic_outline_timer_24px
+ get() = TasksIcons.TIMER
override val sql: String
get() = QueryTemplate()
diff --git a/app/src/main/java/org/tasks/filters/TodayFilter.kt b/app/src/main/java/org/tasks/filters/TodayFilter.kt
index 750850a33..5841427a0 100644
--- a/app/src/main/java/org/tasks/filters/TodayFilter.kt
+++ b/app/src/main/java/org/tasks/filters/TodayFilter.kt
@@ -6,7 +6,7 @@ import org.tasks.data.dao.TaskDao
import org.tasks.data.entity.Task
import org.tasks.data.sql.Criterion
import org.tasks.data.sql.QueryTemplate
-import org.tasks.themes.CustomIcons
+import org.tasks.themes.TasksIcons
@Parcelize
data class TodayFilter(
@@ -23,8 +23,9 @@ data class TodayFilter(
)
)
.toString()
- override val icon: Int
- get() = CustomIcons.TODAY
+
+ override val icon: String
+ get() = TasksIcons.TODAY
override val valuesForNewTasks: String
get() = mapToSerializedString(mapOf(Task.DUE_DATE.name to PermaSql.VALUE_NOON))
diff --git a/app/src/main/java/org/tasks/location/LocationPickerAdapter.java b/app/src/main/java/org/tasks/location/LocationPickerAdapter.java
index d77dc0d6a..0e9626c22 100644
--- a/app/src/main/java/org/tasks/location/LocationPickerAdapter.java
+++ b/app/src/main/java/org/tasks/location/LocationPickerAdapter.java
@@ -9,19 +9,24 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
+
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.DiffUtil.ItemCallback;
import androidx.recyclerview.widget.ListAdapter;
import androidx.recyclerview.widget.RecyclerView;
+
+import com.mikepenz.iconics.IconicsDrawable;
+import com.mikepenz.iconics.typeface.library.googlematerial.OutlinedGoogleMaterial;
+
import org.tasks.R;
import org.tasks.billing.Inventory;
import org.tasks.data.PlaceExtensionsKt;
-import org.tasks.data.entity.Place;
import org.tasks.data.PlaceUsage;
+import org.tasks.data.entity.Place;
+import org.tasks.filters.FilterExtensionsKt;
+import org.tasks.filters.PlaceFilter;
import org.tasks.location.LocationPickerAdapter.PlaceViewHolder;
import org.tasks.themes.ColorProvider;
-import org.tasks.themes.CustomIcons;
-import org.tasks.themes.DrawableUtil;
import org.tasks.themes.ThemeColor;
public class LocationPickerAdapter extends ListAdapter {
@@ -53,6 +58,7 @@ public class LocationPickerAdapter extends ListAdapter onLocationPicked.picked(place));
name = itemView.findViewById(R.id.name);
address = itemView.findViewById(R.id.address);
@@ -106,12 +106,15 @@ public class LocationPickerAdapter extends ListAdapter onLocationPicked.settings(place));
}
- void bind(PlaceUsage placeUsage, int color, int icon) {
+ void bind(PlaceUsage placeUsage, int color, String icon) {
place = placeUsage.place;
String name = PlaceExtensionsKt.getDisplayName(place);
String address = place.getDisplayAddress();
- Drawable wrapped = DrawableUtil.getWrapped(itemView.getContext(), icon);
- this.icon.setImageDrawable(wrapped);
+ Drawable drawable = new IconicsDrawable(
+ context,
+ OutlinedGoogleMaterial.INSTANCE.getIcon("gmo_" + icon)
+ ).mutate();
+ this.icon.setImageDrawable(drawable);
this.icon.getDrawable().setTint(color);
this.name.setText(name);
if (isNullOrEmpty(address) || address.equals(name)) {
@@ -120,7 +123,6 @@ public class LocationPickerAdapter extends ListAdapter getIcon(tagData) },
- getTagColor = { tagData -> getColor(tagData) }
+ getTagIcon = { tagData -> getIcon(tagData) },
+ getTagColor = { tagData -> getColor(tagData) }
)
} /* setContent */
}
@@ -112,15 +115,7 @@ class TagPickerActivity : ThemedInjectingAppCompatActivity() {
return Color(getColor(R.color.icon_tint_with_alpha))
}
- private fun getIcon(tagData: TagData): Int
- {
- val iconIndex = tagData.getIcon()
- var iconResource = R.drawable.ic_outline_label_24px
- if ( (iconIndex != null) && (iconIndex < 1000 || inventory.hasPro) ) {
- iconResource = CustomIcons.getIconResId(iconIndex) ?: R.drawable.ic_outline_label_24px
- }
- return iconResource
- }
+ private fun getIcon(tagData: TagData): String = TagFilter(tagData).getIcon(inventory)
/* Copy of the TagPickerActivity's companion object */
companion object {
@@ -134,7 +129,7 @@ class TagPickerActivity : ThemedInjectingAppCompatActivity() {
internal fun TagPicker(
viewModel: TagPickerViewModel,
onBackClicked: () -> Unit,
- getTagIcon: (TagData) -> Int,
+ getTagIcon: (TagData) -> String,
getTagColor: (TagData) -> Color
) {
Box ( modifier = Modifier.fillMaxSize() )
@@ -194,7 +189,7 @@ internal fun SearchBar(
internal fun PickerBox (
viewModel: TagPickerViewModel,
tags: State>,
- getTagIcon: (TagData) -> Int = { R.drawable.ic_outline_label_24px },
+ getTagIcon: (TagData) -> String = { TasksIcons.LABEL },
getTagColor: (TagData) -> Color = { Color.Gray }
) {
val onClick: (TagData) -> Unit = {
@@ -224,7 +219,7 @@ internal fun PickerBox (
val checked = remember { mutableStateOf ( viewModel.getState(it) ) }
val clickChecked: () -> Unit = { onClick(it); checked.value = viewModel.getState(it) }
TagRow(
- icon = ImageVector.vectorResource(getTagIcon(it)),
+ icon = imageVectorByName(getTagIcon(it))!!,
iconColor = getTagColor(it),
text = it.name!!,
onClick = clickChecked
diff --git a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt
index 496d7ca03..c2c940fd0 100644
--- a/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt
+++ b/app/src/main/java/org/tasks/tasklist/TaskViewHolder.kt
@@ -37,6 +37,7 @@ import org.tasks.filters.PlaceFilter
import org.tasks.filters.TagFilter
import org.tasks.markdown.Markdown
import org.tasks.preferences.Preferences
+import org.tasks.themes.TasksIcons
import org.tasks.themes.TasksTheme
import org.tasks.time.DateTimeUtils2.currentTimeMillis
import org.tasks.time.startOfDay
@@ -276,7 +277,7 @@ class TaskViewHolder internal constructor(
if (place != null && filter !is PlaceFilter && remember { preferences.showPlaceChip }) {
FilterChip(
filter = PlaceFilter(place),
- defaultIcon = R.drawable.ic_outline_place_24px,
+ defaultIcon = TasksIcons.PLACE,
onClick = onClick,
showText = showText,
showIcon = showIcon,
@@ -298,7 +299,7 @@ class TaskViewHolder internal constructor(
}?.let {
FilterChip(
filter = it,
- defaultIcon = R.drawable.ic_list_24px,
+ defaultIcon = TasksIcons.LIST,
onClick = onClick,
showText = showText,
showIcon = showIcon,
@@ -318,7 +319,7 @@ class TaskViewHolder internal constructor(
.forEach {
FilterChip(
filter = it,
- defaultIcon = R.drawable.ic_outline_label_24px,
+ defaultIcon = TasksIcons.LABEL,
onClick = onClick,
showText = showText,
showIcon = showIcon,
diff --git a/app/src/main/java/org/tasks/themes/CustomIcons.kt b/app/src/main/java/org/tasks/themes/CustomIcons.kt
deleted file mode 100644
index 5e462476b..000000000
--- a/app/src/main/java/org/tasks/themes/CustomIcons.kt
+++ /dev/null
@@ -1,226 +0,0 @@
-package org.tasks.themes
-
-import androidx.annotation.DrawableRes
-import org.tasks.R
-
-object CustomIcons {
-
- const val LABEL = 1
- const val FILTER = 2
- const val ALL_INBOX = 4
- const val HISTORY = 6
- const val TODAY = 7
- const val LIST = 8
- const val PLACE = 1050
-
- @JvmStatic
- var ICONS = mapOf(
- LABEL to R.drawable.ic_outline_label_24px,
- FILTER to R.drawable.ic_outline_filter_list_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,
- 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,
- 1001 to R.drawable.ic_outline_pets_24px,
- 1002 to R.drawable.ic_outline_payment_24px,
- 1003 to R.drawable.ic_outline_attach_money_24px,
- 1059 to R.drawable.ic_outline_euro_symbol_24px,
- 1042 to R.drawable.ic_outline_store_24px,
- 1043 to R.drawable.ic_outline_shopping_cart_24px,
- 1004 to R.drawable.ic_outline_hourglass_empty_24px,
- 1005 to R.drawable.ic_outline_favorite_border_24px,
- 1006 to R.drawable.ic_outline_school_24px,
- 1007 to R.drawable.ic_outline_drive_eta_24px,
- 1008 to R.drawable.ic_outline_whatshot_24px,
- 1009 to R.drawable.ic_outline_star_border_24px,
- 1010 to R.drawable.ic_outline_account_balance_24px,
- 1011 to R.drawable.ic_outline_location_city_24px,
- 1012 to R.drawable.ic_outline_cake_24px,
- 1013 to R.drawable.ic_outline_kitchen_24px,
- 1014 to R.drawable.ic_outline_fitness_center_24px,
- 1015 to R.drawable.ic_outline_child_friendly_24px,
- 1016 to R.drawable.ic_outline_free_breakfast_24px,
- 1017 to R.drawable.ic_outline_golf_course_24px,
- 1018 to R.drawable.ic_outline_beach_access_24px,
- 1019 to R.drawable.ic_outline_restaurant_menu_24px,
- 1020 to R.drawable.ic_outline_local_pharmacy_24px,
- 1021 to R.drawable.ic_outline_fastfood_24px,
- 1022 to R.drawable.ic_outline_hotel_24px,
- 1023 to R.drawable.ic_outline_flight_24px,
- 1057 to R.drawable.ic_outline_flight_takeoff_24px,
- 1058 to R.drawable.ic_outline_flight_land_24px,
- 1024 to R.drawable.ic_outline_directions_run_24px,
- 1025 to R.drawable.ic_outline_wb_sunny_24px,
- 1026 to R.drawable.ic_outline_desktop_mac_24px,
- 1027 to R.drawable.ic_outline_computer_24px,
- 1028 to R.drawable.ic_outline_format_paint_24px,
- 1029 to R.drawable.ic_outline_storage_24px,
- 1030 to R.drawable.ic_outline_send_24px,
- 1031 to R.drawable.ic_outline_weekend_24px,
- 1032 to R.drawable.ic_outline_link_24px,
- 1033 to R.drawable.ic_outline_business_24px,
- 1034 to R.drawable.ic_outline_chat_bubble_outline_24px,
- 1035 to R.drawable.ic_outline_voicemail_24px,
- 1036 to R.drawable.ic_outline_email_24px,
- 1037 to R.drawable.ic_outline_call_24px,
- 1039 to R.drawable.ic_outline_movie_24px,
- 1040 to R.drawable.ic_outline_equalizer_24px,
- 1071 to R.drawable.ic_outline_pie_chart_24px,
- 1072 to R.drawable.ic_outline_show_chart_24px,
- 1044 to R.drawable.ic_outline_schedule_24px,
- 1045 to R.drawable.ic_outline_photo_camera_24px,
- 1046 to R.drawable.ic_outline_delete_24px,
- 1047 to R.drawable.ic_outline_attachment_24px,
- 1048 to R.drawable.ic_outline_vpn_key_24px,
- 1049 to R.drawable.ic_outline_event_24px,
- PLACE to R.drawable.ic_outline_place_24px,
- 1051 to R.drawable.ic_outline_markunread_mailbox_24px,
- 1052 to R.drawable.ic_outline_label_important_24px,
- 1053 to R.drawable.ic_outline_android_24px,
- 1054 to R.drawable.ic_outline_build_24px,
- 1055 to R.drawable.ic_outline_bug_report_24px,
- 1056 to R.drawable.ic_outline_book_24px,
- 1060 to R.drawable.ic_outline_explore_24px,
- 1061 to R.drawable.ic_outline_gavel_24px,
- 1063 to R.drawable.ic_outline_print_24px,
- 1064 to R.drawable.ic_outline_receipt_24px,
- 1038 to R.drawable.ic_outline_new_releases_24px,
- 1065 to R.drawable.ic_outline_report_problem_24px,
- 1068 to R.drawable.ic_outline_error_outline_24px,
- 1069 to R.drawable.ic_outline_not_interested_24px,
- 1070 to R.drawable.ic_outline_report_24px,
- 1066 to R.drawable.ic_outline_turned_in_24px,
- 1067 to R.drawable.ic_outline_turned_in_not_24px,
- 1073 to R.drawable.ic_outline_headset_24px,
- 1074 to R.drawable.ic_outline_mic_none_24px,
- 1075 to R.drawable.ic_outline_timer_24px,
- 1076 to R.drawable.ic_outline_clear_24px,
- 1077 to R.drawable.ic_outline_search_24px,
- 1078 to R.drawable.ic_outline_repeat_24px,
- 1079 to R.drawable.ic_outline_notifications_24px,
- 1080 to R.drawable.ic_outline_star_half_24px,
- 1081 to R.drawable.ic_outline_share_24px,
- 1082 to R.drawable.ic_outline_sentiment_very_satisfied_24px,
- 1083 to R.drawable.ic_outline_sentiment_very_dissatisfied_24px,
- 1084 to R.drawable.ic_outline_sentiment_satisfied_24px,
- 1085 to R.drawable.ic_outline_sentiment_dissatisfied_24px,
- 1086 to R.drawable.ic_outline_mood_bad_24px,
- 1087 to R.drawable.ic_outline_mood_24px,
- 1088 to R.drawable.ic_outline_spa_24px,
- 1089 to R.drawable.ic_outline_room_service_24px,
- 1090 to R.drawable.ic_outline_meeting_room_24px,
- 1091 to R.drawable.ic_outline_hot_tub_24px,
- 1092 to R.drawable.ic_outline_business_center_24px,
- 1093 to R.drawable.ic_outline_priority_high_24px,
- 1094 to R.drawable.ic_outline_power_24px,
- 1095 to R.drawable.ic_outline_power_off_24px,
- 1096 to R.drawable.ic_outline_directions_bike_24px,
- 1097 to R.drawable.ic_outline_local_florist_24px,
- 1098 to R.drawable.ic_outline_local_pizza_24px,
- 1099 to R.drawable.ic_outline_navigation_24px,
- 1100 to R.drawable.ic_outline_local_play_24px,
- 1101 to R.drawable.ic_outline_local_bar_24px,
- 1102 to R.drawable.ic_outline_local_laundry_service_24px,
- 1103 to R.drawable.ic_outline_local_offer_24px,
- 1104 to R.drawable.ic_outline_local_shipping_24px,
- 1105 to R.drawable.ic_outline_local_hospital_24px,
- 1106 to R.drawable.ic_outline_directions_boat_24px,
- 1107 to R.drawable.ic_outline_directions_walk_24px,
- 1108 to R.drawable.ic_outline_wb_incandescent_24px,
- 1109 to R.drawable.ic_outline_landscape_24px,
- 1110 to R.drawable.ic_outline_music_note_24px,
- 1111 to R.drawable.ic_outline_healing_24px,
- 1112 to R.drawable.ic_outline_brush_24px,
- 1113 to R.drawable.ic_outline_brightness_2_24px,
- 1114 to R.drawable.ic_outline_security_24px,
- 1115 to R.drawable.ic_outline_scanner_24px,
- 1116 to R.drawable.ic_outline_router_24px,
- 1117 to R.drawable.ic_outline_watch_24px,
- 1118 to R.drawable.ic_outline_videogame_asset_24px,
- 1119 to R.drawable.ic_cached_24px,
- 1120 to R.drawable.ic_octocat,
- 1121 to R.drawable.ic_outline_perm_identity_24px,
- 1122 to R.drawable.ic_track_changes_24px,
- 1123 to R.drawable.ic_open_in_new_24px,
- 1124 to R.drawable.ic_outline_edit_24px,
- 1125 to R.drawable.ic_outline_info_24px,
- 1126 to R.drawable.ic_outline_palette_24px,
- 1127 to R.drawable.ic_outline_sd_storage_24px,
- 1128 to R.drawable.ic_baseline_lens_24px,
- 1129 to R.drawable.ic_map_24px,
- 1130 to R.drawable.ic_check_black_24dp,
- 1131 to R.drawable.ic_undo_24px,
- 1132 to R.drawable.ic_next_week_24px,
- 1133 to R.drawable.ic_local_cafe_24px, // duplicate
- 1134 to R.drawable.ic_nights_stay_24px,
- 1135 to R.drawable.ic_single_bed_24px,
- 1136 to R.drawable.ic_weather_sunset,
- 1137 to R.drawable.ic_calendar_today_24px,
- 1138 to R.drawable.ic_select_all_24px,
- 1139 to R.drawable.ic_widgets_24px,
- 1140 to R.drawable.ic_call_split_24px,
- 1141 to R.drawable.ic_ac_unit_24px,
- 1142 to R.drawable.ic_airport_shuttle_24px,
- 1143 to R.drawable.ic_apartment_24px,
- 1144 to R.drawable.ic_bathtub_24px,
- 1145 to R.drawable.ic_casino_24px,
- 1146 to R.drawable.ic_child_care_24px,
- 1147 to R.drawable.ic_pool_24px,
- 1148 to R.drawable.ic_house_24px,
- 1149 to R.drawable.ic_storefront_24px,
- 1150 to R.drawable.ic_poll_24px,
- 1151 to R.drawable.ic_emoji_transportation_24px,
- 1152 to R.drawable.ic_emoji_objects_24px,
- 1153 to R.drawable.ic_emoji_nature_24px,
- 1154 to R.drawable.ic_emoji_food_beverage_24px,
- 1155 to R.drawable.ic_emoji_events_24px,
- 1156 to R.drawable.ic_deck_24px,
- 1157 to R.drawable.ic_fireplace_24px,
- 1158 to R.drawable.ic_outdoor_grill_24px,
- 1159 to R.drawable.ic_thumb_up_24px,
- 1160 to R.drawable.ic_thumb_down_24px,
- 1161 to R.drawable.ic_vertical_align_top_24px,
- 1162 to R.drawable.ic_keyboard_arrow_left_24px,
- 1163 to R.drawable.ic_keyboard_arrow_right_24px,
- 1164 to R.drawable.ic_content_paste_24px,
- 1165 to R.drawable.ic_content_copy_24px,
- 1166 to R.drawable.ic_outline_play_arrow_24px,
- 1167 to R.drawable.ic_play_circle_outline_24px,
- 1168 to R.drawable.ic_not_started_24px,
- 1169 to R.drawable.ic_date_range_24px,
- 1170 to R.drawable.ic_pending_actions_24px,
- 1171 to R.drawable.ic_outline_visibility_off_24px,
- 1172 to R.drawable.ic_nature_24px,
- 1173 to R.drawable.ic_eco_24px,
- 1174 to R.drawable.ic_bedtime_24px,
- 1175 to R.drawable.ic_auto_stories_24px,
- 1176 to R.drawable.ic_flash_on_24px,
- 1177 to R.drawable.ic_wb_twilight_24px,
- 1178 to R.drawable.ic_local_atm_24px,
- 1179 to R.drawable.ic_cleaning_services_24px,
- 1180 to R.drawable.ic_plumbing_24px,
- 1181 to R.drawable.ic_pest_control_rodent_24px,
- 1182 to R.drawable.ic_outline_people_outline_24,
- 1183 to R.drawable.ic_outline_forum_24,
- 1184 to R.drawable.ic_twitter_logo_black,
- 1185 to R.drawable.ic_outline_person_add_24,
- 1186 to R.drawable.ic_outline_block_24,
- )
-
- @JvmStatic
- fun getIconList() = ICONS.keys.toList()
-
- @JvmStatic
- fun getIconResId(index: Int) = ICONS[index]
-
- @JvmStatic
- fun getIndex(position: Int) = getIconList()[position]
-
- @DrawableRes
- fun getIcon(index: Int, def: Int) = getIconResId(index) ?: def
-}
diff --git a/app/src/main/java/org/tasks/widget/WidgetChipProvider.kt b/app/src/main/java/org/tasks/widget/WidgetChipProvider.kt
index 155d548b2..fee7040bc 100644
--- a/app/src/main/java/org/tasks/widget/WidgetChipProvider.kt
+++ b/app/src/main/java/org/tasks/widget/WidgetChipProvider.kt
@@ -3,10 +3,13 @@ package org.tasks.widget
import android.content.Context
import android.widget.RemoteViews
import androidx.annotation.ColorInt
+import com.mikepenz.iconics.IconicsDrawable
+import com.mikepenz.iconics.typeface.library.googlematerial.OutlinedGoogleMaterial
import com.todoroo.andlib.utility.DateUtilities
import dagger.hilt.android.qualifiers.ApplicationContext
import org.tasks.BuildConfig
import org.tasks.R
+import org.tasks.billing.Inventory
import org.tasks.data.TaskContainer
import org.tasks.data.entity.Task
import org.tasks.data.isHidden
@@ -17,7 +20,7 @@ import org.tasks.filters.Filter
import org.tasks.filters.GtasksFilter
import org.tasks.filters.PlaceFilter
import org.tasks.filters.TagFilter
-import org.tasks.themes.CustomIcons
+import org.tasks.filters.getIcon
import org.tasks.time.startOfDay
import org.tasks.ui.ChipListCache
import java.time.format.FormatStyle
@@ -28,6 +31,7 @@ class WidgetChipProvider @Inject constructor(
@ApplicationContext private val context: Context,
private val chipListCache: ChipListCache,
private val locale: Locale,
+ private val inventory: Inventory,
) {
var isDark = false
@@ -109,11 +113,16 @@ class WidgetChipProvider @Inject constructor(
private fun newChip(filter: Filter, defaultIcon: Int) =
newChip(filter.tint).apply {
setTextViewText(R.id.chip_text, filter.title)
- val icon = filter.icon
- .takeIf { it >= 0 }
- ?.let { CustomIcons.getIconResId(it) }
- ?: defaultIcon
- setImageViewResource(R.id.chip_icon, icon)
+ if (filter.icon.isNullOrBlank()) {
+ setImageViewResource(R.id.chip_icon, defaultIcon)
+ } else {
+ val icon = filter.getIcon(inventory)
+ val drawable = IconicsDrawable(
+ context,
+ OutlinedGoogleMaterial.getIcon("gmo_$icon")
+ )
+ setImageViewBitmap(R.id.chip_icon, drawable.toBitmap())
+ }
}
private fun newChip(@ColorInt color: Int = 0) = RemoteViews(BuildConfig.APPLICATION_ID, R.layout.widget_chip).apply {
diff --git a/app/src/main/res/drawable/ic_ac_unit_24px.xml b/app/src/main/res/drawable/ic_ac_unit_24px.xml
deleted file mode 100644
index be17ef20b..000000000
--- a/app/src/main/res/drawable/ic_ac_unit_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_airport_shuttle_24px.xml b/app/src/main/res/drawable/ic_airport_shuttle_24px.xml
deleted file mode 100644
index 55f2c6594..000000000
--- a/app/src/main/res/drawable/ic_airport_shuttle_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_apartment_24px.xml b/app/src/main/res/drawable/ic_apartment_24px.xml
deleted file mode 100644
index 92bf9a95c..000000000
--- a/app/src/main/res/drawable/ic_apartment_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_auto_stories_24px.xml b/app/src/main/res/drawable/ic_auto_stories_24px.xml
deleted file mode 100644
index 7d417098d..000000000
--- a/app/src/main/res/drawable/ic_auto_stories_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_baseline_lens_24px.xml b/app/src/main/res/drawable/ic_baseline_lens_24px.xml
deleted file mode 100644
index 574a071dd..000000000
--- a/app/src/main/res/drawable/ic_baseline_lens_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_bathtub_24px.xml b/app/src/main/res/drawable/ic_bathtub_24px.xml
deleted file mode 100644
index 31789f886..000000000
--- a/app/src/main/res/drawable/ic_bathtub_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_bedtime_24px.xml b/app/src/main/res/drawable/ic_bedtime_24px.xml
deleted file mode 100644
index 98fac1a9b..000000000
--- a/app/src/main/res/drawable/ic_bedtime_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_casino_24px.xml b/app/src/main/res/drawable/ic_casino_24px.xml
deleted file mode 100644
index 44f33ed40..000000000
--- a/app/src/main/res/drawable/ic_casino_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_child_care_24px.xml b/app/src/main/res/drawable/ic_child_care_24px.xml
deleted file mode 100644
index 8d1035b10..000000000
--- a/app/src/main/res/drawable/ic_child_care_24px.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_cleaning_services_24px.xml b/app/src/main/res/drawable/ic_cleaning_services_24px.xml
deleted file mode 100644
index 0df496dd7..000000000
--- a/app/src/main/res/drawable/ic_cleaning_services_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_content_paste_24px.xml b/app/src/main/res/drawable/ic_content_paste_24px.xml
deleted file mode 100644
index 150bf5828..000000000
--- a/app/src/main/res/drawable/ic_content_paste_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_deck_24px.xml b/app/src/main/res/drawable/ic_deck_24px.xml
deleted file mode 100644
index 2715bb7d3..000000000
--- a/app/src/main/res/drawable/ic_deck_24px.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_eco_24px.xml b/app/src/main/res/drawable/ic_eco_24px.xml
deleted file mode 100644
index 05c477be4..000000000
--- a/app/src/main/res/drawable/ic_eco_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_emoji_events_24px.xml b/app/src/main/res/drawable/ic_emoji_events_24px.xml
deleted file mode 100644
index 02392e055..000000000
--- a/app/src/main/res/drawable/ic_emoji_events_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_emoji_food_beverage_24px.xml b/app/src/main/res/drawable/ic_emoji_food_beverage_24px.xml
deleted file mode 100644
index d2fe6525b..000000000
--- a/app/src/main/res/drawable/ic_emoji_food_beverage_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_emoji_nature_24px.xml b/app/src/main/res/drawable/ic_emoji_nature_24px.xml
deleted file mode 100644
index f411bf1f8..000000000
--- a/app/src/main/res/drawable/ic_emoji_nature_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_emoji_objects_24px.xml b/app/src/main/res/drawable/ic_emoji_objects_24px.xml
deleted file mode 100644
index 3afa918dc..000000000
--- a/app/src/main/res/drawable/ic_emoji_objects_24px.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_emoji_transportation_24px.xml b/app/src/main/res/drawable/ic_emoji_transportation_24px.xml
deleted file mode 100644
index 6f8a4b918..000000000
--- a/app/src/main/res/drawable/ic_emoji_transportation_24px.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_fireplace_24px.xml b/app/src/main/res/drawable/ic_fireplace_24px.xml
deleted file mode 100644
index ec4be0695..000000000
--- a/app/src/main/res/drawable/ic_fireplace_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_flash_on_24px.xml b/app/src/main/res/drawable/ic_flash_on_24px.xml
deleted file mode 100644
index 65d92ec01..000000000
--- a/app/src/main/res/drawable/ic_flash_on_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_house_24px.xml b/app/src/main/res/drawable/ic_house_24px.xml
deleted file mode 100644
index a943f5bec..000000000
--- a/app/src/main/res/drawable/ic_house_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_indeterminate_check_box_24px.xml b/app/src/main/res/drawable/ic_indeterminate_check_box_24px.xml
deleted file mode 100644
index 272cd5fd6..000000000
--- a/app/src/main/res/drawable/ic_indeterminate_check_box_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_left_24px.xml b/app/src/main/res/drawable/ic_keyboard_arrow_left_24px.xml
deleted file mode 100644
index 1b8ffd057..000000000
--- a/app/src/main/res/drawable/ic_keyboard_arrow_left_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_local_atm_24px.xml b/app/src/main/res/drawable/ic_local_atm_24px.xml
deleted file mode 100644
index 2ad9fe824..000000000
--- a/app/src/main/res/drawable/ic_local_atm_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_nature_24px.xml b/app/src/main/res/drawable/ic_nature_24px.xml
deleted file mode 100644
index 28ef470c5..000000000
--- a/app/src/main/res/drawable/ic_nature_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_not_started_24px.xml b/app/src/main/res/drawable/ic_not_started_24px.xml
deleted file mode 100644
index eea606802..000000000
--- a/app/src/main/res/drawable/ic_not_started_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outdoor_grill_24px.xml b/app/src/main/res/drawable/ic_outdoor_grill_24px.xml
deleted file mode 100644
index da68e8079..000000000
--- a/app/src/main/res/drawable/ic_outdoor_grill_24px.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_account_balance_24px.xml b/app/src/main/res/drawable/ic_outline_account_balance_24px.xml
deleted file mode 100644
index 9eaf70fb1..000000000
--- a/app/src/main/res/drawable/ic_outline_account_balance_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_all_inbox_24px.xml b/app/src/main/res/drawable/ic_outline_all_inbox_24px.xml
deleted file mode 100644
index b12992542..000000000
--- a/app/src/main/res/drawable/ic_outline_all_inbox_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_android_24px.xml b/app/src/main/res/drawable/ic_outline_android_24px.xml
deleted file mode 100644
index edde69571..000000000
--- a/app/src/main/res/drawable/ic_outline_android_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_beach_access_24px.xml b/app/src/main/res/drawable/ic_outline_beach_access_24px.xml
deleted file mode 100644
index 865950edf..000000000
--- a/app/src/main/res/drawable/ic_outline_beach_access_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_block_24.xml b/app/src/main/res/drawable/ic_outline_block_24.xml
deleted file mode 100644
index 1e478d2aa..000000000
--- a/app/src/main/res/drawable/ic_outline_block_24.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_book_24px.xml b/app/src/main/res/drawable/ic_outline_book_24px.xml
deleted file mode 100644
index d5c0e4ffb..000000000
--- a/app/src/main/res/drawable/ic_outline_book_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_brightness_2_24px.xml b/app/src/main/res/drawable/ic_outline_brightness_2_24px.xml
deleted file mode 100644
index dddcac76d..000000000
--- a/app/src/main/res/drawable/ic_outline_brightness_2_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_brush_24px.xml b/app/src/main/res/drawable/ic_outline_brush_24px.xml
deleted file mode 100644
index f20d260d1..000000000
--- a/app/src/main/res/drawable/ic_outline_brush_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_business_24px.xml b/app/src/main/res/drawable/ic_outline_business_24px.xml
deleted file mode 100644
index 9b6a5acb1..000000000
--- a/app/src/main/res/drawable/ic_outline_business_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_business_center_24px.xml b/app/src/main/res/drawable/ic_outline_business_center_24px.xml
deleted file mode 100644
index f2cba5fda..000000000
--- a/app/src/main/res/drawable/ic_outline_business_center_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_cake_24px.xml b/app/src/main/res/drawable/ic_outline_cake_24px.xml
deleted file mode 100644
index 1fa08a221..000000000
--- a/app/src/main/res/drawable/ic_outline_cake_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_call_24px.xml b/app/src/main/res/drawable/ic_outline_call_24px.xml
deleted file mode 100644
index 2920e9851..000000000
--- a/app/src/main/res/drawable/ic_outline_call_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_child_friendly_24px.xml b/app/src/main/res/drawable/ic_outline_child_friendly_24px.xml
deleted file mode 100644
index 50b2919df..000000000
--- a/app/src/main/res/drawable/ic_outline_child_friendly_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_cloud_24px.xml b/app/src/main/res/drawable/ic_outline_cloud_24px.xml
deleted file mode 100644
index ebd5ca666..000000000
--- a/app/src/main/res/drawable/ic_outline_cloud_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_desktop_mac_24px.xml b/app/src/main/res/drawable/ic_outline_desktop_mac_24px.xml
deleted file mode 100644
index dfe1f01f2..000000000
--- a/app/src/main/res/drawable/ic_outline_desktop_mac_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_directions_bike_24px.xml b/app/src/main/res/drawable/ic_outline_directions_bike_24px.xml
deleted file mode 100644
index 4a97c93c8..000000000
--- a/app/src/main/res/drawable/ic_outline_directions_bike_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_directions_boat_24px.xml b/app/src/main/res/drawable/ic_outline_directions_boat_24px.xml
deleted file mode 100644
index bd8f97076..000000000
--- a/app/src/main/res/drawable/ic_outline_directions_boat_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_directions_run_24px.xml b/app/src/main/res/drawable/ic_outline_directions_run_24px.xml
deleted file mode 100644
index a8c31fc0d..000000000
--- a/app/src/main/res/drawable/ic_outline_directions_run_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_directions_walk_24px.xml b/app/src/main/res/drawable/ic_outline_directions_walk_24px.xml
deleted file mode 100644
index ba27a4045..000000000
--- a/app/src/main/res/drawable/ic_outline_directions_walk_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_drive_eta_24px.xml b/app/src/main/res/drawable/ic_outline_drive_eta_24px.xml
deleted file mode 100644
index d77cce960..000000000
--- a/app/src/main/res/drawable/ic_outline_drive_eta_24px.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_equalizer_24px.xml b/app/src/main/res/drawable/ic_outline_equalizer_24px.xml
deleted file mode 100644
index ec09da784..000000000
--- a/app/src/main/res/drawable/ic_outline_equalizer_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_euro_symbol_24px.xml b/app/src/main/res/drawable/ic_outline_euro_symbol_24px.xml
deleted file mode 100644
index 1dfd2fb23..000000000
--- a/app/src/main/res/drawable/ic_outline_euro_symbol_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_explore_24px.xml b/app/src/main/res/drawable/ic_outline_explore_24px.xml
deleted file mode 100644
index b8f411e74..000000000
--- a/app/src/main/res/drawable/ic_outline_explore_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_fastfood_24px.xml b/app/src/main/res/drawable/ic_outline_fastfood_24px.xml
deleted file mode 100644
index e7a1af304..000000000
--- a/app/src/main/res/drawable/ic_outline_fastfood_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_filter_list_24px.xml b/app/src/main/res/drawable/ic_outline_filter_list_24px.xml
deleted file mode 100644
index 3ae78f6fa..000000000
--- a/app/src/main/res/drawable/ic_outline_filter_list_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_fitness_center_24px.xml b/app/src/main/res/drawable/ic_outline_fitness_center_24px.xml
deleted file mode 100644
index df54c92d7..000000000
--- a/app/src/main/res/drawable/ic_outline_fitness_center_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_flight_24px.xml b/app/src/main/res/drawable/ic_outline_flight_24px.xml
deleted file mode 100644
index b4fe6dc70..000000000
--- a/app/src/main/res/drawable/ic_outline_flight_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_flight_land_24px.xml b/app/src/main/res/drawable/ic_outline_flight_land_24px.xml
deleted file mode 100644
index e55b385f2..000000000
--- a/app/src/main/res/drawable/ic_outline_flight_land_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_flight_takeoff_24px.xml b/app/src/main/res/drawable/ic_outline_flight_takeoff_24px.xml
deleted file mode 100644
index 65b55d977..000000000
--- a/app/src/main/res/drawable/ic_outline_flight_takeoff_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_format_paint_24px.xml b/app/src/main/res/drawable/ic_outline_format_paint_24px.xml
deleted file mode 100644
index 75bc428c6..000000000
--- a/app/src/main/res/drawable/ic_outline_format_paint_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_free_breakfast_24px.xml b/app/src/main/res/drawable/ic_outline_free_breakfast_24px.xml
deleted file mode 100644
index 5f600966a..000000000
--- a/app/src/main/res/drawable/ic_outline_free_breakfast_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_golf_course_24px.xml b/app/src/main/res/drawable/ic_outline_golf_course_24px.xml
deleted file mode 100644
index 8fae81bd6..000000000
--- a/app/src/main/res/drawable/ic_outline_golf_course_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_headset_24px.xml b/app/src/main/res/drawable/ic_outline_headset_24px.xml
deleted file mode 100644
index bfcf0d500..000000000
--- a/app/src/main/res/drawable/ic_outline_headset_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_healing_24px.xml b/app/src/main/res/drawable/ic_outline_healing_24px.xml
deleted file mode 100644
index 4130830d7..000000000
--- a/app/src/main/res/drawable/ic_outline_healing_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_history_24px.xml b/app/src/main/res/drawable/ic_outline_history_24px.xml
deleted file mode 100644
index f64e95ce9..000000000
--- a/app/src/main/res/drawable/ic_outline_history_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_home_24px.xml b/app/src/main/res/drawable/ic_outline_home_24px.xml
deleted file mode 100644
index c690c5d9a..000000000
--- a/app/src/main/res/drawable/ic_outline_home_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_hot_tub_24px.xml b/app/src/main/res/drawable/ic_outline_hot_tub_24px.xml
deleted file mode 100644
index bbdcb3d9d..000000000
--- a/app/src/main/res/drawable/ic_outline_hot_tub_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_hotel_24px.xml b/app/src/main/res/drawable/ic_outline_hotel_24px.xml
deleted file mode 100644
index 5d061421d..000000000
--- a/app/src/main/res/drawable/ic_outline_hotel_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_hourglass_empty_24px.xml b/app/src/main/res/drawable/ic_outline_hourglass_empty_24px.xml
deleted file mode 100644
index d8705cd10..000000000
--- a/app/src/main/res/drawable/ic_outline_hourglass_empty_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_kitchen_24px.xml b/app/src/main/res/drawable/ic_outline_kitchen_24px.xml
deleted file mode 100644
index 7df626624..000000000
--- a/app/src/main/res/drawable/ic_outline_kitchen_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_label_important_24px.xml b/app/src/main/res/drawable/ic_outline_label_important_24px.xml
deleted file mode 100644
index 7d335e732..000000000
--- a/app/src/main/res/drawable/ic_outline_label_important_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_label_off_24px.xml b/app/src/main/res/drawable/ic_outline_label_off_24px.xml
deleted file mode 100644
index 9ab352318..000000000
--- a/app/src/main/res/drawable/ic_outline_label_off_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_landscape_24px.xml b/app/src/main/res/drawable/ic_outline_landscape_24px.xml
deleted file mode 100644
index 72f4076c6..000000000
--- a/app/src/main/res/drawable/ic_outline_landscape_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_link_24px.xml b/app/src/main/res/drawable/ic_outline_link_24px.xml
deleted file mode 100644
index 33f0a1532..000000000
--- a/app/src/main/res/drawable/ic_outline_link_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_bar_24px.xml b/app/src/main/res/drawable/ic_outline_local_bar_24px.xml
deleted file mode 100644
index 2a32727f0..000000000
--- a/app/src/main/res/drawable/ic_outline_local_bar_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_florist_24px.xml b/app/src/main/res/drawable/ic_outline_local_florist_24px.xml
deleted file mode 100644
index bb5c9cd84..000000000
--- a/app/src/main/res/drawable/ic_outline_local_florist_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_hospital_24px.xml b/app/src/main/res/drawable/ic_outline_local_hospital_24px.xml
deleted file mode 100644
index 9f74efcdc..000000000
--- a/app/src/main/res/drawable/ic_outline_local_hospital_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_laundry_service_24px.xml b/app/src/main/res/drawable/ic_outline_local_laundry_service_24px.xml
deleted file mode 100644
index a9e6b2f53..000000000
--- a/app/src/main/res/drawable/ic_outline_local_laundry_service_24px.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_offer_24px.xml b/app/src/main/res/drawable/ic_outline_local_offer_24px.xml
deleted file mode 100644
index db1aea912..000000000
--- a/app/src/main/res/drawable/ic_outline_local_offer_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_pharmacy_24px.xml b/app/src/main/res/drawable/ic_outline_local_pharmacy_24px.xml
deleted file mode 100644
index c4654fded..000000000
--- a/app/src/main/res/drawable/ic_outline_local_pharmacy_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_pizza_24px.xml b/app/src/main/res/drawable/ic_outline_local_pizza_24px.xml
deleted file mode 100644
index 1afd5c929..000000000
--- a/app/src/main/res/drawable/ic_outline_local_pizza_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_play_24px.xml b/app/src/main/res/drawable/ic_outline_local_play_24px.xml
deleted file mode 100644
index eb89cc743..000000000
--- a/app/src/main/res/drawable/ic_outline_local_play_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_local_shipping_24px.xml b/app/src/main/res/drawable/ic_outline_local_shipping_24px.xml
deleted file mode 100644
index de697138d..000000000
--- a/app/src/main/res/drawable/ic_outline_local_shipping_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_location_city_24px.xml b/app/src/main/res/drawable/ic_outline_location_city_24px.xml
deleted file mode 100644
index 3813e1dd2..000000000
--- a/app/src/main/res/drawable/ic_outline_location_city_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_markunread_mailbox_24px.xml b/app/src/main/res/drawable/ic_outline_markunread_mailbox_24px.xml
deleted file mode 100644
index 8c67f41b9..000000000
--- a/app/src/main/res/drawable/ic_outline_markunread_mailbox_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_meeting_room_24px.xml b/app/src/main/res/drawable/ic_outline_meeting_room_24px.xml
deleted file mode 100644
index 5b263d8b5..000000000
--- a/app/src/main/res/drawable/ic_outline_meeting_room_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_mood_24px.xml b/app/src/main/res/drawable/ic_outline_mood_24px.xml
deleted file mode 100644
index 6e5917de4..000000000
--- a/app/src/main/res/drawable/ic_outline_mood_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_mood_bad_24px.xml b/app/src/main/res/drawable/ic_outline_mood_bad_24px.xml
deleted file mode 100644
index 1d43178b7..000000000
--- a/app/src/main/res/drawable/ic_outline_mood_bad_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_movie_24px.xml b/app/src/main/res/drawable/ic_outline_movie_24px.xml
deleted file mode 100644
index 762c99940..000000000
--- a/app/src/main/res/drawable/ic_outline_movie_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_music_note_24px.xml b/app/src/main/res/drawable/ic_outline_music_note_24px.xml
deleted file mode 100644
index c6837d05a..000000000
--- a/app/src/main/res/drawable/ic_outline_music_note_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_navigation_24px.xml b/app/src/main/res/drawable/ic_outline_navigation_24px.xml
deleted file mode 100644
index 2215af843..000000000
--- a/app/src/main/res/drawable/ic_outline_navigation_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_notifications_off_24px.xml b/app/src/main/res/drawable/ic_outline_notifications_off_24px.xml
deleted file mode 100644
index 1a1c86a89..000000000
--- a/app/src/main/res/drawable/ic_outline_notifications_off_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_pause_24px.xml b/app/src/main/res/drawable/ic_outline_pause_24px.xml
deleted file mode 100644
index c84df9c5d..000000000
--- a/app/src/main/res/drawable/ic_outline_pause_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_payment_24px.xml b/app/src/main/res/drawable/ic_outline_payment_24px.xml
deleted file mode 100644
index f0f0c749f..000000000
--- a/app/src/main/res/drawable/ic_outline_payment_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_pets_24px.xml b/app/src/main/res/drawable/ic_outline_pets_24px.xml
deleted file mode 100644
index c74a02f71..000000000
--- a/app/src/main/res/drawable/ic_outline_pets_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_pie_chart_24px.xml b/app/src/main/res/drawable/ic_outline_pie_chart_24px.xml
deleted file mode 100644
index 1144e7580..000000000
--- a/app/src/main/res/drawable/ic_outline_pie_chart_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_play_arrow_24px.xml b/app/src/main/res/drawable/ic_outline_play_arrow_24px.xml
deleted file mode 100644
index 653e53505..000000000
--- a/app/src/main/res/drawable/ic_outline_play_arrow_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_power_24px.xml b/app/src/main/res/drawable/ic_outline_power_24px.xml
deleted file mode 100644
index edcf73def..000000000
--- a/app/src/main/res/drawable/ic_outline_power_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_power_off_24px.xml b/app/src/main/res/drawable/ic_outline_power_off_24px.xml
deleted file mode 100644
index 362c33c90..000000000
--- a/app/src/main/res/drawable/ic_outline_power_off_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_print_24px.xml b/app/src/main/res/drawable/ic_outline_print_24px.xml
deleted file mode 100644
index 0498ceadc..000000000
--- a/app/src/main/res/drawable/ic_outline_print_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_priority_high_24px.xml b/app/src/main/res/drawable/ic_outline_priority_high_24px.xml
deleted file mode 100644
index d335596c5..000000000
--- a/app/src/main/res/drawable/ic_outline_priority_high_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_receipt_24px.xml b/app/src/main/res/drawable/ic_outline_receipt_24px.xml
deleted file mode 100644
index a817cb02a..000000000
--- a/app/src/main/res/drawable/ic_outline_receipt_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_report_24px.xml b/app/src/main/res/drawable/ic_outline_report_24px.xml
deleted file mode 100644
index 55e892456..000000000
--- a/app/src/main/res/drawable/ic_outline_report_24px.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_report_problem_24px.xml b/app/src/main/res/drawable/ic_outline_report_problem_24px.xml
deleted file mode 100644
index e1550ce3b..000000000
--- a/app/src/main/res/drawable/ic_outline_report_problem_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_restaurant_menu_24px.xml b/app/src/main/res/drawable/ic_outline_restaurant_menu_24px.xml
deleted file mode 100644
index bb1910d91..000000000
--- a/app/src/main/res/drawable/ic_outline_restaurant_menu_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_room_service_24px.xml b/app/src/main/res/drawable/ic_outline_room_service_24px.xml
deleted file mode 100644
index 38d7b72a2..000000000
--- a/app/src/main/res/drawable/ic_outline_room_service_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_router_24px.xml b/app/src/main/res/drawable/ic_outline_router_24px.xml
deleted file mode 100644
index 06f07aca3..000000000
--- a/app/src/main/res/drawable/ic_outline_router_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_scanner_24px.xml b/app/src/main/res/drawable/ic_outline_scanner_24px.xml
deleted file mode 100644
index f3a64394b..000000000
--- a/app/src/main/res/drawable/ic_outline_scanner_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_school_24px.xml b/app/src/main/res/drawable/ic_outline_school_24px.xml
deleted file mode 100644
index e1b139e8c..000000000
--- a/app/src/main/res/drawable/ic_outline_school_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_security_24px.xml b/app/src/main/res/drawable/ic_outline_security_24px.xml
deleted file mode 100644
index 7f9c9b777..000000000
--- a/app/src/main/res/drawable/ic_outline_security_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_sentiment_dissatisfied_24px.xml b/app/src/main/res/drawable/ic_outline_sentiment_dissatisfied_24px.xml
deleted file mode 100644
index 1e015cfa1..000000000
--- a/app/src/main/res/drawable/ic_outline_sentiment_dissatisfied_24px.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_sentiment_satisfied_24px.xml b/app/src/main/res/drawable/ic_outline_sentiment_satisfied_24px.xml
deleted file mode 100644
index cc0c2d291..000000000
--- a/app/src/main/res/drawable/ic_outline_sentiment_satisfied_24px.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_sentiment_very_dissatisfied_24px.xml b/app/src/main/res/drawable/ic_outline_sentiment_very_dissatisfied_24px.xml
deleted file mode 100644
index 936f16920..000000000
--- a/app/src/main/res/drawable/ic_outline_sentiment_very_dissatisfied_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_sentiment_very_satisfied_24px.xml b/app/src/main/res/drawable/ic_outline_sentiment_very_satisfied_24px.xml
deleted file mode 100644
index 5747bf76e..000000000
--- a/app/src/main/res/drawable/ic_outline_sentiment_very_satisfied_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_share_24px.xml b/app/src/main/res/drawable/ic_outline_share_24px.xml
deleted file mode 100644
index 740a73026..000000000
--- a/app/src/main/res/drawable/ic_outline_share_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_shopping_cart_24px.xml b/app/src/main/res/drawable/ic_outline_shopping_cart_24px.xml
deleted file mode 100644
index 712a30d3b..000000000
--- a/app/src/main/res/drawable/ic_outline_shopping_cart_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_show_chart_24px.xml b/app/src/main/res/drawable/ic_outline_show_chart_24px.xml
deleted file mode 100644
index 860b796ae..000000000
--- a/app/src/main/res/drawable/ic_outline_show_chart_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_spa_24px.xml b/app/src/main/res/drawable/ic_outline_spa_24px.xml
deleted file mode 100644
index 5031e7be2..000000000
--- a/app/src/main/res/drawable/ic_outline_spa_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_star_half_24px.xml b/app/src/main/res/drawable/ic_outline_star_half_24px.xml
deleted file mode 100644
index 7809c8399..000000000
--- a/app/src/main/res/drawable/ic_outline_star_half_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_storage_24px.xml b/app/src/main/res/drawable/ic_outline_storage_24px.xml
deleted file mode 100644
index e3d3457ab..000000000
--- a/app/src/main/res/drawable/ic_outline_storage_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_store_24px.xml b/app/src/main/res/drawable/ic_outline_store_24px.xml
deleted file mode 100644
index 46ce8fa78..000000000
--- a/app/src/main/res/drawable/ic_outline_store_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_turned_in_24px.xml b/app/src/main/res/drawable/ic_outline_turned_in_24px.xml
deleted file mode 100644
index 5b0832b29..000000000
--- a/app/src/main/res/drawable/ic_outline_turned_in_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_turned_in_not_24px.xml b/app/src/main/res/drawable/ic_outline_turned_in_not_24px.xml
deleted file mode 100644
index 44fd5525b..000000000
--- a/app/src/main/res/drawable/ic_outline_turned_in_not_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_videogame_asset_24px.xml b/app/src/main/res/drawable/ic_outline_videogame_asset_24px.xml
deleted file mode 100644
index 3a39a9e0c..000000000
--- a/app/src/main/res/drawable/ic_outline_videogame_asset_24px.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_visibility_off_24px.xml b/app/src/main/res/drawable/ic_outline_visibility_off_24px.xml
deleted file mode 100644
index 98638c669..000000000
--- a/app/src/main/res/drawable/ic_outline_visibility_off_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_voicemail_24px.xml b/app/src/main/res/drawable/ic_outline_voicemail_24px.xml
deleted file mode 100644
index a79575398..000000000
--- a/app/src/main/res/drawable/ic_outline_voicemail_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_watch_24px.xml b/app/src/main/res/drawable/ic_outline_watch_24px.xml
deleted file mode 100644
index 35dd35cfa..000000000
--- a/app/src/main/res/drawable/ic_outline_watch_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_wb_incandescent_24px.xml b/app/src/main/res/drawable/ic_outline_wb_incandescent_24px.xml
deleted file mode 100644
index bbaa25ec6..000000000
--- a/app/src/main/res/drawable/ic_outline_wb_incandescent_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_weekend_24px.xml b/app/src/main/res/drawable/ic_outline_weekend_24px.xml
deleted file mode 100644
index 0b01caaf1..000000000
--- a/app/src/main/res/drawable/ic_outline_weekend_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_whatshot_24px.xml b/app/src/main/res/drawable/ic_outline_whatshot_24px.xml
deleted file mode 100644
index e05bb8f86..000000000
--- a/app/src/main/res/drawable/ic_outline_whatshot_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_outline_work_outline_24px.xml b/app/src/main/res/drawable/ic_outline_work_outline_24px.xml
deleted file mode 100644
index c52b68772..000000000
--- a/app/src/main/res/drawable/ic_outline_work_outline_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_pest_control_rodent_24px.xml b/app/src/main/res/drawable/ic_pest_control_rodent_24px.xml
deleted file mode 100644
index 61b27a2bd..000000000
--- a/app/src/main/res/drawable/ic_pest_control_rodent_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_play_circle_outline_24px.xml b/app/src/main/res/drawable/ic_play_circle_outline_24px.xml
deleted file mode 100644
index ddebe9ed9..000000000
--- a/app/src/main/res/drawable/ic_play_circle_outline_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_plumbing_24px.xml b/app/src/main/res/drawable/ic_plumbing_24px.xml
deleted file mode 100644
index 843ce9f42..000000000
--- a/app/src/main/res/drawable/ic_plumbing_24px.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_poll_24px.xml b/app/src/main/res/drawable/ic_poll_24px.xml
deleted file mode 100644
index d43c68308..000000000
--- a/app/src/main/res/drawable/ic_poll_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_pool_24px.xml b/app/src/main/res/drawable/ic_pool_24px.xml
deleted file mode 100644
index 43483c631..000000000
--- a/app/src/main/res/drawable/ic_pool_24px.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
diff --git a/app/src/main/res/drawable/ic_single_bed_24px.xml b/app/src/main/res/drawable/ic_single_bed_24px.xml
deleted file mode 100644
index 6f83afc5c..000000000
--- a/app/src/main/res/drawable/ic_single_bed_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_storefront_24px.xml b/app/src/main/res/drawable/ic_storefront_24px.xml
deleted file mode 100644
index a9174f8b9..000000000
--- a/app/src/main/res/drawable/ic_storefront_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_thumb_down_24px.xml b/app/src/main/res/drawable/ic_thumb_down_24px.xml
deleted file mode 100644
index 61c1217d4..000000000
--- a/app/src/main/res/drawable/ic_thumb_down_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_thumb_up_24px.xml b/app/src/main/res/drawable/ic_thumb_up_24px.xml
deleted file mode 100644
index 5f0151bef..000000000
--- a/app/src/main/res/drawable/ic_thumb_up_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_track_changes_24px.xml b/app/src/main/res/drawable/ic_track_changes_24px.xml
deleted file mode 100644
index 43f743c86..000000000
--- a/app/src/main/res/drawable/ic_track_changes_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_undo_24px.xml b/app/src/main/res/drawable/ic_undo_24px.xml
deleted file mode 100644
index f893a544a..000000000
--- a/app/src/main/res/drawable/ic_undo_24px.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
diff --git a/app/src/main/res/drawable/ic_wb_twilight_24px.xml b/app/src/main/res/drawable/ic_wb_twilight_24px.xml
deleted file mode 100644
index 18c374c1d..000000000
--- a/app/src/main/res/drawable/ic_wb_twilight_24px.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/reminder_dialog_background.xml b/app/src/main/res/drawable/reminder_dialog_background.xml
deleted file mode 100644
index fbc9d6203..000000000
--- a/app/src/main/res/drawable/reminder_dialog_background.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable/widget_ripple_dark.xml b/app/src/main/res/drawable/widget_ripple_dark.xml
deleted file mode 100644
index 2977bb0c2..000000000
--- a/app/src/main/res/drawable/widget_ripple_dark.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-