Remove option to disable desaturation

pull/3209/head
Alex Baker 11 months ago
parent cc64952032
commit d6266226b2

@ -368,7 +368,6 @@ class TaskEditFragment : Fragment() {
onChanged = { text -> editViewModel.title = text.toString().trim { it <= ' ' } },
linkify = if (preferences.linkify) linkify else null,
markdownProvider = markdownProvider,
desaturate = remember { preferences.desaturateDarkMode },
isCompleted = isComplete,
isRecurring = isRecurring,
priority = editViewModel.priority.collectAsStateWithLifecycle().value,
@ -426,7 +425,6 @@ class TaskEditFragment : Fragment() {
PriorityRow(
priority = editViewModel.priority.collectAsStateWithLifecycle().value,
onChangePriority = { editViewModel.priority.value = it },
desaturate = preferences.desaturateDarkMode,
)
}

@ -647,10 +647,10 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
private fun setupRefresh(layout: SwipeRefreshLayout) {
layout.setOnRefreshListener(this)
layout.setColorSchemeColors(
colorProvider.getPriorityColor(0, true),
colorProvider.getPriorityColor(1, true),
colorProvider.getPriorityColor(2, true),
colorProvider.getPriorityColor(3, true))
colorProvider.getPriorityColor(0),
colorProvider.getPriorityColor(1),
colorProvider.getPriorityColor(2),
colorProvider.getPriorityColor(3))
}
override fun onResume() {
@ -810,7 +810,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
.filterNot { it.readOnly }
.takeIf { it.isNotEmpty() }
?.let {
newPriorityPicker(preferences.getBoolean(R.string.p_desaturate_colors, false), it)
newPriorityPicker(it)
.show(parentFragmentManager, FRAG_TAG_PRIORITY_PICKER)
}
}

@ -34,7 +34,7 @@ class Notifier @Inject constructor(
private val voiceOutputAssistant: VoiceOutputAssistant,
private val preferences: Preferences) {
private val colorProvider: ColorProvider = ColorProvider(context, preferences)
private val colorProvider: ColorProvider = ColorProvider(context)
suspend fun triggerFilterNotification(filter: Filter) {
val tasks = taskDao.fetchFiltered(filter)
@ -66,7 +66,7 @@ class Notifier @Inject constructor(
.setAutoCancel(true)
.setWhen(currentTimeMillis())
.setShowWhen(true)
.setColor(colorProvider.getPriorityColor(maxPriority, true))
.setColor(colorProvider.getPriorityColor(maxPriority))
.setGroupSummary(true)
.setGroup(filter.title)
.setStyle(style)

@ -16,7 +16,6 @@ fun CheckBox(
task: Task,
onCompleteClick: () -> Unit,
modifier: Modifier = Modifier,
desaturate: Boolean,
) {
CheckBox(
isCompleted = task.isCompleted,
@ -24,7 +23,6 @@ fun CheckBox(
priority = task.priority,
onCompleteClick = onCompleteClick,
modifier = modifier,
desaturate = desaturate,
)
}
@ -35,7 +33,6 @@ fun CheckBox(
priority: Int,
onCompleteClick: () -> Unit,
modifier: Modifier = Modifier,
desaturate: Boolean,
) {
IconButton(onClick = onCompleteClick, modifier = modifier) {
Icon(
@ -44,7 +41,6 @@ fun CheckBox(
priorityColor(
priority = priority,
isDarkMode = isSystemInDarkTheme(),
desaturate = desaturate,
)
),
contentDescription = null,

@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.LocalMinimumInteractiveComponentSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.RadioButton
@ -36,7 +35,6 @@ import org.tasks.themes.TasksTheme
fun PriorityRow(
priority: Int,
onChangePriority: (Int) -> Unit,
desaturate: Boolean,
) {
TaskEditRow(
iconRes = R.drawable.ic_outline_flag_24px,
@ -44,7 +42,6 @@ fun PriorityRow(
PriorityLabeled(
selected = priority,
onClick = { onChangePriority(it) },
desaturate = desaturate,
)
},
)
@ -54,7 +51,6 @@ fun PriorityRow(
fun Priority(
selected: Int,
onClick: (Int) -> Unit = {},
desaturate: Boolean,
) {
Row(horizontalArrangement = Arrangement.SpaceBetween) {
for (i in Task.Priority.NONE downTo Task.Priority.HIGH) {
@ -62,7 +58,6 @@ fun Priority(
priority = i,
selected = selected,
onClick = onClick,
desaturate = desaturate,
)
}
}
@ -72,7 +67,6 @@ fun Priority(
fun PriorityLabeled(
selected: Int,
onClick: (Int) -> Unit = {},
desaturate: Boolean,
) {
Row(
modifier = Modifier
@ -90,23 +84,20 @@ fun PriorityLabeled(
color = MaterialTheme.colorScheme.onSurface,
)
Spacer(modifier = Modifier.weight(1f))
Priority(selected = selected, onClick = onClick, desaturate = desaturate)
Priority(selected = selected, onClick = onClick)
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun RowScope.PriorityButton(
@Task.Priority priority: Int,
selected: Int,
desaturate: Boolean,
onClick: (Int) -> Unit,
) {
val color = Color(
priorityColor(
priority = priority,
isDarkMode = isSystemInDarkTheme(),
desaturate = desaturate,
)
)
CompositionLocalProvider(
@ -135,7 +126,6 @@ fun PriorityPreview() {
PriorityRow(
priority = Task.Priority.MEDIUM,
onChangePriority = {},
desaturate = true,
)
}
}
@ -148,7 +138,6 @@ fun PriorityPreviewNoDesaturate() {
PriorityRow(
priority = Task.Priority.MEDIUM,
onChangePriority = {},
desaturate = false,
)
}
}
@ -161,7 +150,6 @@ fun PriorityNarrowWidth() {
PriorityRow(
priority = Task.Priority.MEDIUM,
onChangePriority = {},
desaturate = false,
)
}
}

@ -54,7 +54,6 @@ fun SubtaskRow(
originalFilter: Filter?,
filter: Filter?,
hasParent: Boolean,
desaturate: Boolean,
existingSubtasks: TasksResults,
newSubtasks: List<Task>,
openSubtask: (Task) -> Unit,
@ -100,7 +99,6 @@ fun SubtaskRow(
.forEach { task ->
ExistingSubtaskRow(
task = task,
desaturate = desaturate,
indent = if (filter !is GtasksFilter) task.indent else 0,
onRowClick = { openSubtask(task.task) },
onCompleteClick = {
@ -116,7 +114,6 @@ fun SubtaskRow(
newSubtasks.forEach { subtask ->
NewSubtaskRow(
subtask = subtask,
desaturate = desaturate,
addSubtask = addSubtask,
onComplete = completeNewSubtask,
onDelete = deleteSubtask,
@ -138,7 +135,6 @@ fun SubtaskRow(
@Composable
fun NewSubtaskRow(
subtask: Task,
desaturate: Boolean,
addSubtask: () -> Unit,
onComplete: (Task) -> Unit,
onDelete: (Task) -> Unit,
@ -148,7 +144,6 @@ fun NewSubtaskRow(
task = subtask,
onCompleteClick = { onComplete(subtask) },
modifier = Modifier.align(Alignment.Top),
desaturate = desaturate,
)
var text by remember(subtask.remoteId) { mutableStateOf(subtask.title ?: "") }
val focusRequester = remember { FocusRequester() }
@ -194,7 +189,6 @@ fun NewSubtaskRow(
@Composable
fun ExistingSubtaskRow(
task: TaskContainer, indent: Int,
desaturate: Boolean,
onRowClick: () -> Unit,
onCompleteClick: () -> Unit,
onToggleSubtaskClick: () -> Unit,
@ -209,7 +203,6 @@ fun ExistingSubtaskRow(
CheckBox(
task = task.task,
onCompleteClick = onCompleteClick,
desaturate = desaturate,
modifier = Modifier.align(Alignment.Top),
)
Text(
@ -244,7 +237,6 @@ fun NoSubtasks() {
originalFilter = null,
filter = null,
hasParent = false,
desaturate = true,
existingSubtasks = TasksResults.Results(SectionedDataSource()),
newSubtasks = emptyList(),
openSubtask = {},
@ -266,7 +258,6 @@ fun SubtasksPreview() {
originalFilter = null,
filter = null,
hasParent = false,
desaturate = true,
existingSubtasks = TasksResults.Results(
SectionedDataSource(
tasks = listOf(

@ -25,7 +25,6 @@ fun TitleRow(
onChanged: (CharSequence?) -> Unit,
linkify: Linkify?,
markdownProvider: MarkdownProvider?,
desaturate: Boolean,
isCompleted: Boolean,
isRecurring: Boolean,
priority: Int,
@ -39,7 +38,6 @@ fun TitleRow(
isRecurring = isRecurring,
priority = priority,
onCompleteClick = onComplete,
desaturate = desaturate,
modifier = Modifier.padding(
start = 4.dp,
end = 20.dp,
@ -75,7 +73,6 @@ fun EmptyTitlePreview() {
onChanged = {},
linkify = null,
markdownProvider = null,
desaturate = true,
isCompleted = false,
isRecurring = false,
priority = 0,
@ -100,7 +97,6 @@ fun TitlePreview() {
onChanged = {},
linkify = null,
markdownProvider = null,
desaturate = true,
isCompleted = false,
isRecurring = false,
priority = 0,

@ -28,12 +28,10 @@ class PriorityPicker : DialogFragment() {
companion object {
const val EXTRA_TASKS = "extra_tasks"
const val EXTRA_DESATURATE = "extra_desaturatee"
fun newPriorityPicker(desaturateColors: Boolean, tasks: List<Task>): PriorityPicker {
fun newPriorityPicker(tasks: List<Task>): PriorityPicker {
val bundle = Bundle()
bundle.putLongArray(EXTRA_TASKS, tasks.map { it.id }.toLongArray())
bundle.putBoolean(EXTRA_DESATURATE, desaturateColors)
val fragment = PriorityPicker()
fragment.arguments = bundle
return fragment
@ -48,8 +46,7 @@ class PriorityPicker : DialogFragment() {
val inflater = fragmentActivity.layoutInflater
val binding = DialogPriorityPickerBinding.inflate(inflater, null, false)
binding.priorityRow.setContent { Priority(selected = priorityPickerViewModel.priority.collectAsStateWithLifecycle().value,
onClick = { priorityPickerViewModel.setPriority( it ) }, desaturate = savedInstanceState?.getBoolean(
EXTRA_DESATURATE) ?: false) }
onClick = { priorityPickerViewModel.setPriority( it ) }) }
val builder = AlertDialog.Builder(fragmentActivity)
.setTitle(R.string.change_priority)
.setView(binding.root)

@ -15,7 +15,6 @@ import org.tasks.R
import org.tasks.data.dao.LocationDao
import org.tasks.data.dao.NotificationDao
import org.tasks.data.dao.TaskDao
import org.tasks.data.displayName
import org.tasks.data.entity.Alarm
import org.tasks.data.entity.Notification
import org.tasks.filters.NotificationsFilter
@ -52,7 +51,7 @@ class NotificationManager @Inject constructor(
val currentInterruptionFilter: Int
get() = notificationManager.currentInterruptionFilter
private val colorProvider = ColorProvider(context, preferences)
private val colorProvider = ColorProvider(context)
private val queue = NotificationLimiter(MAX_NOTIFICATIONS)
@SuppressLint("CheckResult")
@ -262,7 +261,7 @@ class NotificationManager @Inject constructor(
.setShowWhen(true)
.setSmallIcon(R.drawable.ic_done_all_white_24dp)
.setStyle(style)
.setColor(colorProvider.getPriorityColor(maxPriority, true))
.setColor(colorProvider.getPriorityColor(maxPriority))
.setOnlyAlertOnce(false)
.setContentIntent(
PendingIntent.getActivity(
@ -316,7 +315,7 @@ class NotificationManager @Inject constructor(
val builder = NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_DEFAULT)
.setCategory(NotificationCompat.CATEGORY_REMINDER)
.setContentTitle(taskTitle)
.setColor(colorProvider.getPriorityColor(task.priority, true))
.setColor(colorProvider.getPriorityColor(task.priority))
.setSmallIcon(R.drawable.ic_check_white_24dp)
.setWhen(`when`)
.setOnlyAlertOnce(false)

@ -577,9 +577,6 @@ class Preferences @JvmOverloads constructor(
get() = getBoolean(R.string.p_shown_beast_mode_hint, false)
set(value) = setBoolean(R.string.p_shown_beast_mode_hint, value)
val desaturateDarkMode: Boolean
get() = getBoolean(R.string.p_desaturate_colors, true)
val linkify: Boolean
get() = getBoolean(R.string.p_linkify_task_edit, false)

@ -69,13 +69,6 @@ class LookAndFeel : InjectingPreferenceFragment() {
false
}
findPreference(R.string.p_desaturate_colors).setOnPreferenceChangeListener { _, _ ->
if (context?.isNightMode == true) {
activity?.recreate()
}
true
}
val defaultList = findPreference(R.string.p_default_open_filter)
val filter = defaultFilterProvider.getDefaultOpenFilter()
defaultList.summary = filter.title

@ -11,14 +11,12 @@ import javax.inject.Inject
class ColorProvider @Inject constructor(
@param:ApplicationContext private val context: Context,
preferences: Preferences
) {
private val isDark = context.resources.getBoolean(R.bool.is_dark)
private val desaturate = preferences.desaturateDarkMode
private fun getColor(@ColorInt color: Int, adjust: Boolean) =
if (adjust && isDark && desaturate) {
if (adjust && isDark) {
saturated[color] ?: color
} else {
color
@ -27,13 +25,12 @@ class ColorProvider @Inject constructor(
fun getThemeColor(@ColorInt color: Int, adjust: Boolean = true) =
ThemeColor(context, color, getColor(color, adjust))
fun getPriorityColor(priority: Int, adjust: Boolean = true) = priorityColor(
fun getPriorityColor(priority: Int) = priorityColor(
priority = priority,
isDarkMode = isDark,
desaturate = adjust && desaturate,
)
fun getThemeAccent(index: Int) = ThemeAccent(context, if (isDark && desaturate) {
fun getThemeAccent(index: Int) = ThemeAccent(context, if (isDark) {
ThemeAccent.ACCENTS_DESATURATED[index]
} else {
ThemeAccent.ACCENTS[index]

@ -58,7 +58,6 @@ class SubtaskControlSet : TaskEditControlFragment() {
originalFilter = viewModel.originalList,
filter = viewModel.selectedList.collectAsStateWithLifecycle().value,
hasParent = viewModel.hasParent,
desaturate = preferences.desaturateDarkMode,
existingSubtasks = if (viewModel.isNew) {
TasksResults.Results(SectionedDataSource())
} else {

@ -116,7 +116,6 @@
<string name="opacity">التعتيم</string>
<string name="settings_localization">تخصيص اللغة و الجهة</string>
<string name="backup_BAc_export">نسخ احتياطي الآن</string>
<string name="desaturate_colors">ألوان غير مشبعة</string>
<string name="accent">اللون الثانوي</string>
<string name="theme_system_default">افتراضيات النظام</string>
<string name="theme_day_night">صباحي/مسائي</string>
@ -146,8 +145,6 @@
<string name="widget_open_list">فتح قائمة</string>
<string name="open_last_viewed_list">فتح آخر قائمة تم عرضها</string>
<string name="on_launch">عند فتح التطبيق</string>
<string name="desaturate_colors_summary_off">ستكون الألوان مشبعة في المظهر الداكن</string>
<string name="desaturate_colors_summary_on">ستكون الألوان غير مشبعة في المظهر الداكن</string>
<string name="default_list">القائمة الافتراضية</string>
<string name="google_tasks_add_to_top">اضف المهام الجديدة لاعلى القائمة</string>
<string name="add_account">أضف حساب</string>

@ -567,7 +567,6 @@
<string name="ok">Добре</string>
<string name="chips">Индикатори в списъка</string>
<string name="chip_appearance">Външен вид на индикаторите в списъка</string>
<string name="desaturate_colors">Намаляване на наситеността на цветовете</string>
<string name="filter_any_due_date">Всяка крайна дата</string>
<string name="android_auto_backup">Услуга за резервни копия на Android</string>
<string name="device_settings">Настройки на устройството</string>
@ -575,9 +574,7 @@
<string name="sort_start_group">Започната %s</string>
<string name="sort_due_group">Завършена %s</string>
<string name="on_launch">При стартиране</string>
<string name="desaturate_colors_summary_on">При тъмите теми цветовете ще бъдат с намалена наситеност</string>
<string name="sort_created_group">Създадена %s</string>
<string name="desaturate_colors_summary_off">При тъмите теми цветовете няма да бъдат променяни</string>
<string name="sort_modified_group">Променена %s</string>
<string name="github_sponsor">Дарител</string>
<string name="tasks_org_account_required">Необходим е профил в Tasks.org</string>

@ -447,9 +447,6 @@
<string name="navigation_drawer">Postranní nabídka</string>
<string name="place_settings">Nastavení místa</string>
<string name="places">Místa</string>
<string name="desaturate_colors_summary_off">Barvy nebudou jemnější u tmavých motivů vzhledu</string>
<string name="desaturate_colors_summary_on">Barvy budou jemnější u tmavých motivů vzhledu</string>
<string name="desaturate_colors">Zjemnit barvy</string>
<string name="action_new_task">Nový úkol</string>
<string name="caldav_home_set_not_found">Domovská sada nenalezena</string>
<string name="list_separator_with_space">", "</string>

@ -136,9 +136,6 @@
<string name="navigation_drawer">Navigationsmenu</string>
<string name="place_settings">Indstillinger for steder</string>
<string name="places">Steder</string>
<string name="desaturate_colors_summary_off">Farverne bliver ikke afmættede i mørke temaer</string>
<string name="desaturate_colors_summary_on">Farverne bliver afmættede i mørke temaer</string>
<string name="desaturate_colors">Afmættede farver</string>
<string name="chip_appearance">Boble-udseende</string>
<string name="chips">Bobler</string>
<string name="back">Tilbage</string>

@ -431,9 +431,6 @@
<string name="back">Zurück</string>
<string name="chips">Marken</string>
<string name="chip_appearance">Aussehen der Marken</string>
<string name="desaturate_colors">Entsättigte Farben</string>
<string name="desaturate_colors_summary_on">Farben werden bei dunklen Designs entsättigt</string>
<string name="desaturate_colors_summary_off">Farben werden bei dunklen Designs nicht entsättigt</string>
<string name="places">Orte</string>
<string name="place_settings">Ortseinstellungen</string>
<string name="navigation_drawer">Navigationsmenü</string>

@ -629,9 +629,6 @@
<string name="share_list">Komunigi liston</string>
<string name="not_signed_in">Ne ensalutinte</string>
<string name="map_theme_use_app_theme">Uzi etoson de programeto</string>
<string name="desaturate_colors">Malsaturi kolorojn</string>
<string name="desaturate_colors_summary_on">Koloroj malsaturiĝos en malhela etoso</string>
<string name="desaturate_colors_summary_off">Koloroj ne malsaturiĝos en malhela etoso</string>
<string name="widget_id">Fenestraĵa ID: %d</string>
<string name="sort_start_group">Komenci %s</string>
<string name="open_last_viewed_list">Malfermi liston de laste rigardita</string>

@ -450,9 +450,6 @@
<string name="back">Volver</string>
<string name="chips">Distintivos</string>
<string name="chip_appearance">Apariencia de los distintivos</string>
<string name="desaturate_colors">Colores desaturados</string>
<string name="desaturate_colors_summary_on">Los colores serán desaturados en temas oscuros</string>
<string name="desaturate_colors_summary_off">Los colores no se desaturarán en los temas oscuros</string>
<string name="places">Lugares</string>
<string name="place_settings">Ajustes de lugar</string>
<string name="navigation_drawer">Cajón de navegación</string>

@ -434,9 +434,6 @@
<string name="back">Atzera</string>
<string name="chips">Txipak</string>
<string name="chip_appearance">Txip itxura</string>
<string name="desaturate_colors">Desasetu koloreak</string>
<string name="desaturate_colors_summary_on">Koloreak desasetuko dira azal ilunetan</string>
<string name="desaturate_colors_summary_off">Koloreak ez dira desasetuko azal ilunetan</string>
<string name="places">Tokiak</string>
<string name="place_settings">Toki-ezarpenak</string>
<string name="navigation_drawer">Nabigazio tiradera</string>

@ -338,8 +338,6 @@
<string name="chip_appearance_icon_only">Vain pikkukuvake</string>
<string name="chip_appearance_text_only">Vain teksti</string>
<string name="chip_appearance_text_and_icon">Teksti ja pikkukuvake</string>
<string name="desaturate_colors_summary_off">Värejä ei muuteta tummiin teemoihin</string>
<string name="desaturate_colors_summary_on">Tummissa teemoissa värit ovat tyydyttymättömiä</string>
<string name="chip_appearance">Lappujen sisältö</string>
<string name="chips">Lisätietolaput</string>
<string name="back">Takaisin</string>
@ -448,7 +446,6 @@
<string name="custom_filter_criteria">Suodin kriteerit</string>
<string name="auto_dismiss_datetime_list">Tehtävä lista</string>
<string name="navigation_drawer">Navigointi valikko</string>
<string name="desaturate_colors">Himmennä värit</string>
<string name="show_advanced_settings">Näytä lisäasetukset</string>
<string name="google_tasks_selection_description">Perus palvelu joka synkronoi sinun Google tilisi kanssa</string>
<string name="opacity_footer">Alatunnisteen läpinäkyvyys</string>

@ -450,9 +450,6 @@
<string name="back">Retour</string>
<string name="chips">Étiquettes</string>
<string name="chip_appearance">Apparence de l\'étiquette</string>
<string name="desaturate_colors">Désaturer les couleurs</string>
<string name="desaturate_colors_summary_on">Les couleurs seront désaturées dans les thèmes sombres</string>
<string name="desaturate_colors_summary_off">Les couleurs ne seront pas désaturées dans les thèmes sombres</string>
<string name="places">Lieux</string>
<string name="place_settings">Paramètres de lieu</string>
<string name="navigation_drawer">Tiroir de navigation</string>

@ -399,8 +399,6 @@
<string name="preferences_look_and_feel">Estilo e apariencia</string>
<string name="preferences_advanced">Avanzada</string>
<string name="places">Lugares</string>
<string name="desaturate_colors_summary_on">As cores desaturaranse nos estilos escuros</string>
<string name="desaturate_colors_summary_off">As cores non se desaturan nos estilos escuros</string>
<string name="place_settings">Configuración de posición</string>
<string name="hide_unused_tags">Agochar etiquetas sen usar</string>
<string name="hide_unused_places">Agochar lugares sen usar</string>

@ -144,9 +144,6 @@
<string name="hide_unused_places">Sakrij nekorištena mjesta</string>
<string name="place_settings">Postavke mjesta</string>
<string name="places">Mjesta</string>
<string name="desaturate_colors_summary_off">Boje neće biti nezasićene u tamnim temama</string>
<string name="desaturate_colors_summary_on">Boje će biti nezasićene u tamnim temama</string>
<string name="desaturate_colors">Nezasićene boje</string>
<string name="color_wheel">Krug boja</string>
<string name="chip_appearance_icon_only">Samo ikona</string>
<string name="chip_appearance_text_only">Samo tekst</string>

@ -429,9 +429,6 @@
<string name="back">Vissza</string>
<string name="chips">Jelölő</string>
<string name="chip_appearance">Jelölő kinézete</string>
<string name="desaturate_colors">Fakó színek</string>
<string name="desaturate_colors_summary_on">Sötét téma esetén fakóbbak a színek</string>
<string name="desaturate_colors_summary_off">Sötét téma esetén élénk színek</string>
<string name="places">Helyek</string>
<string name="place_settings">Hely beállítások</string>
<string name="hide_unused_tags">Használaton kívüli címkék elrejtése</string>

@ -517,9 +517,6 @@
<string name="hide_unused_places">Sembunyikan tempat yang tidak digunakan</string>
<string name="place_settings">Pengaturan tempat</string>
<string name="places">Tempat</string>
<string name="desaturate_colors_summary_off">Warna tidak akan dikurangi/desaturasi dalam tema gelap</string>
<string name="desaturate_colors_summary_on">Warna akan dikurangi/desaturasi dalam tema gelap</string>
<string name="desaturate_colors">Pengurangan/desaturasi warna</string>
<string name="chips">Chip</string>
<string name="color_wheel">Roda warna</string>
<string name="wearable_notifications_summary">Tampilkan notifikasi pada alat wearable Anda</string>

@ -395,7 +395,6 @@
<string name="display_name">Nome visualizzato</string>
<string name="TEA_add_subtask">Aggiungi attività secondaria</string>
<string name="SSD_sort_my_order">Personalizzato</string>
<string name="desaturate_colors">Riduci saturazione colori</string>
<string name="share">Condividi</string>
<string name="select_all">Seleziona tutto</string>
<string name="calendar_event_created">Creato evento nel calendario per %s</string>
@ -412,8 +411,6 @@
<string name="navigation_drawer">Menù laterale</string>
<string name="place_settings">Impostazioni luogo</string>
<string name="places">Luoghi</string>
<string name="desaturate_colors_summary_on">I colori perderanno saturazione nei temi scuri</string>
<string name="desaturate_colors_summary_off">I colori non perderanno saturazione nei temi scuri</string>
<string name="back">Indietro</string>
<string name="upgrade_blurb_2">Ho dedicato a Tasks migliaia di ore di lavoro, pubblicando tutto il codice sorgente online, gratuitamente. Per supportare il mio lavoro alcune funzioni richiedono un abbonamento</string>
<string name="upgrade_blurb_1">Ciao! Mi chiamo Alex. Sono lo sviluppatore indipendente di Tasks</string>

@ -536,9 +536,6 @@
<string name="sort_modified_group">%s נערך</string>
<string name="sort_created_group">%s נוצר</string>
<string name="davx5_selection_description">סנכרון המשימות שלך עם היישומון DAVx⁵</string>
<string name="desaturate_colors_summary_on">הצבעים יאפירו בערכות צבע כהות</string>
<string name="desaturate_colors_summary_off">הצבעים לא יאפירו בערכות צבע כהות</string>
<string name="desaturate_colors">האפרת צבעים</string>
<string name="chip_appearance">מראה הצ׳יפ</string>
<string name="chips">צ׳יפים</string>
<string name="account">חשבון</string>

@ -508,7 +508,6 @@
<string name="caldav_selection_description">オープンインターネット標準による同期</string>
<string name="etesync_selection_description">エンドツーエンド暗号化による同期</string>
<string name="microsoft_selection_description">個人用 Microsoftアカウントと同期する</string>
<string name="desaturate_colors_summary_off">ダークテーマの使用時に彩度は下がりません</string>
<string name="chip_appearance_text_and_icon">文字とアイコン</string>
<string name="chip_appearance_text_only">文字のみ</string>
<string name="shortcut_pick_time">時間を選択</string>
@ -569,7 +568,6 @@
<string name="documentation">ドキュメント</string>
<string name="color_wheel">カラーホイール</string>
<string name="more_notification_settings_summary">通知音、バイブレーションなど</string>
<string name="desaturate_colors">彩度を下げる</string>
<string name="wearable_notifications_summary">ウェアラブルデバイスに通知を表示する</string>
<string name="auto_dismiss_datetime_list">タスクリスト</string>
<string name="backup_location_warning">警告: Tasks を削除すると %s にあるファイルも削除されます。ファイルの削除を回避するには、別の場所を指定してください。</string>
@ -645,7 +643,6 @@
<string name="above_average">平均以上</string>
<string name="filter_any_start_date">着手日時あり</string>
<string name="chip_appearance">チップの外観</string>
<string name="desaturate_colors_summary_on">ダークテーマの使用時に彩度が下がります</string>
<string name="sort_modified_group">変更: %s</string>
<string name="sort_start_group">着手: %s</string>
<string name="sort_due_group">締切: %s</string>

@ -425,9 +425,6 @@
<string name="place_settings">장소 설정</string>
<string name="places">장소</string>
<string name="upgrade_blurb_1">안녕하세요! Tasks의 1인 개발자 알렉스입니다</string>
<string name="desaturate_colors_summary_on">다크 테마 사용 시 채도를 낮춥니다</string>
<string name="desaturate_colors_summary_off">다크 테마 사용 시 채도를 낮추지 않습니다</string>
<string name="desaturate_colors">저채도 색상</string>
<string name="chip_appearance">칩 모양</string>
<string name="chips"></string>
<string name="upgrade_blurb_2">저는 Tasks 개발에 엄청나게 많은 시간을 쏟고 있으며, 모든 소스코드를 웹에 무상으로 공개하고 있습니다. 저의 작업을 후원하기 위해 일부 기능은 구독이 필요합니다</string>

@ -625,9 +625,6 @@
<string name="auto_dismiss_datetime_edit_summary">Automatiškai uždaryti renkantis iš užduoties redagavimo</string>
<string name="auto_dismiss_datetime_edit">Užduoties redagavimas</string>
<string name="color_wheel">Spalvos pasirinkimo ratas</string>
<string name="desaturate_colors_summary_on">Tamsiose temose spalvos bus nublankę</string>
<string name="desaturate_colors_summary_off">Tamsiose temose spalvos nebus nublankę</string>
<string name="desaturate_colors">Blankios spalvos</string>
<string name="chip_appearance">Skrituliuko išvaizda</string>
<string name="chips">Skrituliukai</string>
<string name="widget_id">Valdiklio ID: %d</string>

@ -463,9 +463,6 @@
<string name="hide_unused_places">Skjul ubrukte steder</string>
<string name="hide_unused_tags">Skjul ubrukte etiketter</string>
<string name="navigation_drawer">Navigasjonsskuff</string>
<string name="desaturate_colors_summary_off">Farger vil ikke miste metning i mørke drakter</string>
<string name="desaturate_colors_summary_on">Farger vil miste metning i mørke drakter</string>
<string name="desaturate_colors">Gi farger mindre metning</string>
<string name="chip_appearance">Flisutseende</string>
<string name="chips">Flis</string>
<string name="upgrade_blurb_2">Jeg har brukt tusenvis av timer på å jobbe med Tasks, og jeg offentliggjør all kildekoden på nettet gratis. For å støtte mitt arbeid krever noen funksjoner et abonnement</string>

@ -429,9 +429,6 @@
<string name="back">Terug</string>
<string name="chips">Vormgeving</string>
<string name="chip_appearance">Uiterlijk van chip</string>
<string name="desaturate_colors">Minder verzadigde kleuren</string>
<string name="desaturate_colors_summary_on">Minder verzadigde kleuren in donkere thema\'s</string>
<string name="desaturate_colors_summary_off">Niet minder verzadigde kleuren in donkere thema\'s</string>
<string name="places">Locaties</string>
<string name="place_settings">Locatie instellen</string>
<string name="navigation_drawer">Menu</string>

@ -445,9 +445,6 @@
<string name="back">Wstecz</string>
<string name="chips">Chipy</string>
<string name="chip_appearance">Wygląd chipów</string>
<string name="desaturate_colors">Desaturuj kolory</string>
<string name="desaturate_colors_summary_on">Kolory będą desaturowane w ciemnych motywach</string>
<string name="desaturate_colors_summary_off">Kolory nie będą desaturowane w ciemnych motywach</string>
<string name="shortcut_pick_time">Wybierz czas</string>
<string name="no_time">Brak czasu</string>
<string name="no_date">Brak daty</string>

@ -412,9 +412,6 @@
<string name="navigation_drawer">Menu de navegação</string>
<string name="place_settings">Configuração de lugares</string>
<string name="places">Locais</string>
<string name="desaturate_colors_summary_off">Cores não serão dessaturadas em temas escuros</string>
<string name="desaturate_colors_summary_on">Cores serão dessaturadas em temas escuros</string>
<string name="desaturate_colors">Dessaturar cores</string>
<string name="chip_appearance">Aparência da Pastilha</string>
<string name="chips">Pastilha</string>
<string name="back">Voltar</string>

@ -446,9 +446,6 @@
<string name="navigation_drawer">Gaveta de navegação</string>
<string name="place_settings">Configuração de locais</string>
<string name="places">Locais</string>
<string name="desaturate_colors_summary_off">As cores não serão dessaturadas em temas escuros</string>
<string name="desaturate_colors_summary_on">As cores serão dessaturadas em temas escuros</string>
<string name="desaturate_colors">Dessaturar cores</string>
<string name="chip_appearance">Aparência da ficha</string>
<string name="chips">Fichas</string>
<string name="back">Voltar</string>

@ -547,9 +547,6 @@
<string name="navigation_drawer">Sertar de navigare</string>
<string name="place_settings">Setări de locație</string>
<string name="places">Locuri</string>
<string name="desaturate_colors_summary_off">Culorile nu vor fi desaturate în temele întunecate</string>
<string name="desaturate_colors_summary_on">Culorile vor fi desaturate în temele întunecate</string>
<string name="desaturate_colors">Desaturare culori</string>
<string name="chip_appearance">Aspect fragmentat</string>
<string name="chips">Fragmente</string>
<string name="back">Înapoi</string>

@ -451,9 +451,6 @@
<string name="back">Назад</string>
<string name="chips">Индикаторы</string>
<string name="chip_appearance">Внешний вид индикаторов</string>
<string name="desaturate_colors">Уменьшить насыщенность цветов</string>
<string name="desaturate_colors_summary_on">Цвета будут менее насыщенными в темных темах</string>
<string name="desaturate_colors_summary_off">Цвета не будут менее насыщенными в темных темах</string>
<string name="shortcut_pick_time">Выбрать время</string>
<string name="no_time">Без времени</string>
<string name="no_date">Без даты</string>

@ -23,8 +23,6 @@
<string name="calendar_event_created">%s සඳහා දින දර්ශන සිදුවීම නිර්මාණය කරන ලදි</string>
<string name="auto_dismiss_datetime_widget">විජට්</string>
<string name="auto_dismiss_datetime_edit">කාර්ය සංස්කරණය</string>
<string name="desaturate_colors_summary_off">අඳුරු තේමාවන් වලදී වර්ණ අසංතෘප්ත නොවේ</string>
<string name="desaturate_colors">අවිනිශ්චිත වර්ණ</string>
<string name="chip_appearance">චිප් පෙනුම</string>
<string name="TEA_timer_est">කාලය %s</string>
<plurals name="list_count">
@ -631,7 +629,6 @@
<string name="foreground_location">පෙරබිම ස්ථානය</string>
<string name="navigation_drawer">මෙනුව</string>
<string name="place_settings">ස්ථාන සැකසුම්</string>
<string name="desaturate_colors_summary_on">අඳුරු තේමාවන් වලදී වර්ණ අසංතෘප්ත වේ</string>
<string name="repeat_snackbar">%1$s, %2$s සඳහා නැවත සකස් කරන ලදි</string>
<string name="CFC_importance_text">අවම වශයෙන් ප්‍රමුඛතාවය \?</string>
<string name="chat_libera">ලිබරා චැට් හි #කාර්යයන් හා සම්බන්ධ වන්න</string>

@ -549,12 +549,9 @@
<string name="auto_dismiss_datetime_list_summary">Stäng automatiskt vid val från uppgiftslistan</string>
<string name="auto_dismiss_datetime_list">Uppgiftslista</string>
<string name="auto_dismiss_datetime">Automatisk stängning av datum- och tidsväljare</string>
<string name="desaturate_colors_summary_on">Färgerna kommer att avmattas i mörka teman</string>
<string name="hide_unused_places">Dölj oanvända platser</string>
<string name="hide_unused_tags">Dölj oanvända taggar</string>
<string name="navigation_drawer">Navigeringslåda</string>
<string name="desaturate_colors_summary_off">Färger avmattas inte i mörka teman</string>
<string name="desaturate_colors">Avmatta färger</string>
<string name="chip_appearance">Utseende av flis</string>
<string name="chips">Pommes frites</string>
<string name="upgrade_blurb_1">Hej! Jag heter Alex. Jag är den oberoende utvecklaren bakom Tasks</string>

@ -177,9 +177,6 @@
<string name="hide_unused_tags">பயன்படுத்தப்படாத குறிச்சொற்களை மறைக்கவும்</string>
<string name="place_settings">அமைப்புகளை வைக்கவும்</string>
<string name="places">இடங்கள்</string>
<string name="desaturate_colors_summary_off">இருண்ட கருப்பொருள்களில் நிறங்கள் அழிக்கப்படாது</string>
<string name="desaturate_colors_summary_on">இருண்ட கருப்பொருள்களில் நிறங்கள் தேய்மானம் செய்யப்படும்</string>
<string name="desaturate_colors">தேய்மான நிறங்கள்</string>
<string name="chip_appearance">சிப் தோற்றம்</string>
<string name="back">மீண்டும்</string>
<string name="upgrade_blurb_2">நான் பணிகளில் ஆயிரக்கணக்கான மணிநேரங்களை செலவிட்டேன், மேலும் மூலக் குறியீடு அனைத்தையும் ஆன்லைனில் இலவசமாக வெளியிடுகிறேன். எனது பணியை ஆதரிக்க சில அம்சங்களுக்கு சந்தா தேவை</string>

@ -143,9 +143,6 @@
<string name="filter_high_priority">ลําดับความสําคัญสูง</string>
<string name="add_tags">เพิ่มแท็ก</string>
<string name="places">สถานที่</string>
<string name="desaturate_colors_summary_off">สีจะไม่ถูก desaturated ในธีมสีเข้ม</string>
<string name="desaturate_colors_summary_on">สีจะถูก desaturated ในธีมสีเข้ม</string>
<string name="desaturate_colors">สีที่อิ่มตัว</string>
<string name="chip_appearance">ลักษณะชิป</string>
<string name="chips">เศษ</string>
<string name="back">กลับ</string>

@ -434,9 +434,6 @@
<string name="back">Geri</string>
<string name="chips">Yongalar</string>
<string name="chip_appearance">Yonga görünümü</string>
<string name="desaturate_colors">Renkleri solgunlaştır</string>
<string name="desaturate_colors_summary_on">Renkler karanlık gövdelerde solgunlaştırılacak</string>
<string name="desaturate_colors_summary_off">Renkler karanlık gövdelerde solgunlaştırılmayacak</string>
<string name="places">Yerler</string>
<string name="place_settings">Yer ayarları</string>
<string name="navigation_drawer">Gezinim çekmecesi</string>

@ -417,9 +417,6 @@
<string name="preferences_look_and_feel">Зовнішній вигляд</string>
<string name="preferences_advanced">Розширені</string>
<string name="show_advanced_settings">Показати розширені налаштування</string>
<string name="desaturate_colors">Зменшити насиченість</string>
<string name="desaturate_colors_summary_off">Кольори не будуть ненасиченими в темних темах</string>
<string name="desaturate_colors_summary_on">Кольори будуть ненасиченими в темних темах</string>
<string name="theme_system_default">За системними налаштуваннями</string>
<plurals name="subtask_count">
<item quantity="one">%d підзавдання</item>

@ -199,9 +199,6 @@
<string name="navigation_drawer">Ngăn điều hướng</string>
<string name="place_settings">Cài đặt địa điểm</string>
<string name="places">Địa điểm</string>
<string name="desaturate_colors_summary_off">Màu sắc sẽ không được khử bão hoà ở các chủ đề tối</string>
<string name="desaturate_colors_summary_on">Màu sắc sẽ được khử bão hoà ở các chủ đề tối</string>
<string name="desaturate_colors">Khử bão hoà màu sắc</string>
<string name="chip_appearance">Ngoại hình nhãn</string>
<string name="chips">Nhãn</string>
<string name="back">Quay lại</string>

@ -424,9 +424,6 @@
<string name="back">返回</string>
<string name="chips">纸片</string>
<string name="chip_appearance">纸片外观</string>
<string name="desaturate_colors">降低颜色饱和度</string>
<string name="desaturate_colors_summary_on">在深色主题下,降低颜色饱和度</string>
<string name="desaturate_colors_summary_off">在深色主题下,不降低颜色饱和度</string>
<string name="places">地点</string>
<string name="place_settings">地点设置</string>
<string name="navigation_drawer">导航抽屉</string>

@ -341,7 +341,6 @@
<string name="chip_appearance_text_only">僅文字</string>
<string name="hide_unused_places">隱藏未使用地點</string>
<string name="hide_unused_tags">隱藏未使用標籤</string>
<string name="desaturate_colors_summary_off">暗色主題中顏色將不飽和</string>
<string name="color_wheel">色輪</string>
<string name="invalid_username_or_password">無效的使用者名稱或密碼</string>
<string name="more_notification_settings_summary">鈴聲、震動、與更多</string>
@ -578,7 +577,6 @@
<string name="picker_mode_clock">時鐘</string>
<string name="upgrade_more_customization_description">解鎖所有主題、顏色和圖示</string>
<string name="back">返回</string>
<string name="desaturate_colors_summary_on">在深色主題中將減淡顏色</string>
<string name="place_settings">位置設定</string>
<string name="places">地點</string>
<string name="pro_dashclock_extension">Dashclock 擴充</string>
@ -634,7 +632,6 @@
<string name="google_tasks_selection_description">基本服務,與您的 Google 帳戶同步</string>
<string name="etesync_selection_description">端對端加密同步</string>
<string name="upgrade_blurb_1">嗨!我的名字是 Alex。我是 Tasks 背後的獨立開發者</string>
<string name="desaturate_colors">減淡顏色</string>
<string name="calendar_event_created">建立行事曆事件於 %s</string>
<string name="widget_id">小工具 ID%d</string>
<string name="permission_read_tasks">完全存取 Tasks 資料庫</string>

@ -389,7 +389,6 @@
<string name="p_place_chips">chips_place</string>
<string name="p_list_chips">chips_list</string>
<string name="p_tag_chips">chips_tag</string>
<string name="p_desaturate_colors">desaturate_colors</string>
<string name="p_auto_dismiss_datetime_edit_screen">auto_dismiss_datetime_edit_screen</string>
<string name="p_auto_dismiss_datetime_list_screen">auto_dismiss_datetime_list_screen</string>
<string name="p_auto_dismiss_datetime_widget">auto_dismiss_datetime_widget</string>

@ -548,9 +548,6 @@ File %1$s contained %2$s.\n\n
<string name="back">Back</string>
<string name="chips">Chips</string>
<string name="chip_appearance">Chip appearance</string>
<string name="desaturate_colors">Desaturate colors</string>
<string name="desaturate_colors_summary_on">Colors will be desaturated in dark themes</string>
<string name="desaturate_colors_summary_off">Colors will not be desaturated in dark themes</string>
<string name="places">Places</string>
<string name="place_settings">Place settings</string>
<string name="navigation_drawer">Navigation drawer</string>

@ -19,13 +19,6 @@
android:key="@string/p_theme_launcher"
android:title="@string/launcher_icon" />
<SwitchPreferenceCompat
android:defaultValue="true"
android:key="@string/p_desaturate_colors"
android:title="@string/desaturate_colors"
android:summaryOn="@string/desaturate_colors_summary_on"
android:summaryOff="@string/desaturate_colors_summary_off" />
<ListPreference
android:defaultValue="0"
android:key="@string/p_map_theme"

@ -60,14 +60,14 @@ object ColorProvider {
-5792882 to -5135210 // birch
)
fun priorityColor(priority: Int, isDarkMode: Boolean = false, desaturate: Boolean = false): Int {
fun priorityColor(priority: Int, isDarkMode: Boolean = false): Int {
val color = when (priority) {
in Int.MIN_VALUE..Task.Priority.HIGH -> RED_500
Task.Priority.MEDIUM -> AMBER_500
Task.Priority.LOW -> BLUE_500
else -> GREY_500
}
return if (isDarkMode && desaturate) {
return if (isDarkMode) {
saturated[color] ?: color
} else {
color

Loading…
Cancel
Save