diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt index 3eaaa1f22..06264644c 100755 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.kt @@ -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, ) } diff --git a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt index c098db7ab..1f1ad426a 100644 --- a/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt +++ b/app/src/main/java/com/todoroo/astrid/activity/TaskListFragment.kt @@ -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) } } diff --git a/app/src/main/java/org/tasks/Notifier.kt b/app/src/main/java/org/tasks/Notifier.kt index a0b4044c8..b5cd116c0 100644 --- a/app/src/main/java/org/tasks/Notifier.kt +++ b/app/src/main/java/org/tasks/Notifier.kt @@ -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) diff --git a/app/src/main/java/org/tasks/compose/CheckBox.kt b/app/src/main/java/org/tasks/compose/CheckBox.kt index 8279308fd..93f6a4c66 100644 --- a/app/src/main/java/org/tasks/compose/CheckBox.kt +++ b/app/src/main/java/org/tasks/compose/CheckBox.kt @@ -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, diff --git a/app/src/main/java/org/tasks/compose/edit/PriorityRow.kt b/app/src/main/java/org/tasks/compose/edit/PriorityRow.kt index 4a992d9cb..c88f5ed30 100644 --- a/app/src/main/java/org/tasks/compose/edit/PriorityRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/PriorityRow.kt @@ -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, ) } } diff --git a/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt b/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt index 7e74996c6..0f2eeb8ad 100644 --- a/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/SubtaskRow.kt @@ -54,7 +54,6 @@ fun SubtaskRow( originalFilter: Filter?, filter: Filter?, hasParent: Boolean, - desaturate: Boolean, existingSubtasks: TasksResults, newSubtasks: List, 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( diff --git a/app/src/main/java/org/tasks/compose/edit/TitleRow.kt b/app/src/main/java/org/tasks/compose/edit/TitleRow.kt index b091de3ab..57802e9fe 100644 --- a/app/src/main/java/org/tasks/compose/edit/TitleRow.kt +++ b/app/src/main/java/org/tasks/compose/edit/TitleRow.kt @@ -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, diff --git a/app/src/main/java/org/tasks/dialogs/PriorityPicker.kt b/app/src/main/java/org/tasks/dialogs/PriorityPicker.kt index 41b977b33..554e74ce1 100644 --- a/app/src/main/java/org/tasks/dialogs/PriorityPicker.kt +++ b/app/src/main/java/org/tasks/dialogs/PriorityPicker.kt @@ -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): PriorityPicker { + fun newPriorityPicker(tasks: List): 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) diff --git a/app/src/main/java/org/tasks/notifications/NotificationManager.kt b/app/src/main/java/org/tasks/notifications/NotificationManager.kt index 6f0eec08f..20bc6584e 100644 --- a/app/src/main/java/org/tasks/notifications/NotificationManager.kt +++ b/app/src/main/java/org/tasks/notifications/NotificationManager.kt @@ -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) diff --git a/app/src/main/java/org/tasks/preferences/Preferences.kt b/app/src/main/java/org/tasks/preferences/Preferences.kt index 993119ffc..7664e245f 100644 --- a/app/src/main/java/org/tasks/preferences/Preferences.kt +++ b/app/src/main/java/org/tasks/preferences/Preferences.kt @@ -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) diff --git a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt index e3d8974e9..34c6d2264 100644 --- a/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt +++ b/app/src/main/java/org/tasks/preferences/fragments/LookAndFeel.kt @@ -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 diff --git a/app/src/main/java/org/tasks/themes/ColorProvider.kt b/app/src/main/java/org/tasks/themes/ColorProvider.kt index 6bd883961..cff2c7eba 100644 --- a/app/src/main/java/org/tasks/themes/ColorProvider.kt +++ b/app/src/main/java/org/tasks/themes/ColorProvider.kt @@ -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] diff --git a/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt b/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt index 06b895447..5db957605 100644 --- a/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt +++ b/app/src/main/java/org/tasks/ui/SubtaskControlSet.kt @@ -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 { diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 310e82f36..a27f995ab 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -116,7 +116,6 @@ التعتيم تخصيص اللغة و الجهة نسخ احتياطي الآن - ألوان غير مشبعة اللون الثانوي افتراضيات النظام صباحي/مسائي @@ -146,8 +145,6 @@ فتح قائمة فتح آخر قائمة تم عرضها عند فتح التطبيق - ستكون الألوان مشبعة في المظهر الداكن - ستكون الألوان غير مشبعة في المظهر الداكن القائمة الافتراضية اضف المهام الجديدة لاعلى القائمة أضف حساب diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 1f149fa0e..6008572f8 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -567,7 +567,6 @@ Добре Индикатори в списъка Външен вид на индикаторите в списъка - Намаляване на наситеността на цветовете Всяка крайна дата Услуга за резервни копия на Android Настройки на устройството @@ -575,9 +574,7 @@ Започната %s Завършена %s При стартиране - При тъмите теми цветовете ще бъдат с намалена наситеност Създадена %s - При тъмите теми цветовете няма да бъдат променяни Променена %s Дарител Необходим е профил в Tasks.org diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 1dc077f70..8952b7083 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -447,9 +447,6 @@ Postranní nabídka Nastavení místa Místa - Barvy nebudou jemnější u tmavých motivů vzhledu - Barvy budou jemnější u tmavých motivů vzhledu - Zjemnit barvy Nový úkol Domovská sada nenalezena ", " diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 72f633c8a..adf64ce8c 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -136,9 +136,6 @@ Navigationsmenu Indstillinger for steder Steder - Farverne bliver ikke afmættede i mørke temaer - Farverne bliver afmættede i mørke temaer - Afmættede farver Boble-udseende Bobler Tilbage diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ff6c1c76c..f620930b4 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -431,9 +431,6 @@ Zurück Marken Aussehen der Marken - Entsättigte Farben - Farben werden bei dunklen Designs entsättigt - Farben werden bei dunklen Designs nicht entsättigt Orte Ortseinstellungen Navigationsmenü diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 38f293a90..2349b91df 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -629,9 +629,6 @@ Komunigi liston Ne ensalutinte Uzi etoson de programeto - Malsaturi kolorojn - Koloroj malsaturiĝos en malhela etoso - Koloroj ne malsaturiĝos en malhela etoso Fenestraĵa ID: %d Komenci %s Malfermi liston de laste rigardita diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6d9a67392..41dc97b06 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -450,9 +450,6 @@ Volver Distintivos Apariencia de los distintivos - Colores desaturados - Los colores serán desaturados en temas oscuros - Los colores no se desaturarán en los temas oscuros Lugares Ajustes de lugar Cajón de navegación diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 9d560f22b..a61133571 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -434,9 +434,6 @@ Atzera Txipak Txip itxura - Desasetu koloreak - Koloreak desasetuko dira azal ilunetan - Koloreak ez dira desasetuko azal ilunetan Tokiak Toki-ezarpenak Nabigazio tiradera diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 7f4f16d7a..b41ad802f 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -338,8 +338,6 @@ Vain pikkukuvake Vain teksti Teksti ja pikkukuvake - Värejä ei muuteta tummiin teemoihin - Tummissa teemoissa värit ovat tyydyttymättömiä Lappujen sisältö Lisätietolaput Takaisin @@ -448,7 +446,6 @@ Suodin kriteerit Tehtävä lista Navigointi valikko - Himmennä värit Näytä lisäasetukset Perus palvelu joka synkronoi sinun Google tilisi kanssa Alatunnisteen läpinäkyvyys diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index f78939167..3d30e4360 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -450,9 +450,6 @@ Retour Étiquettes Apparence de l\'étiquette - Désaturer les couleurs - Les couleurs seront désaturées dans les thèmes sombres - Les couleurs ne seront pas désaturées dans les thèmes sombres Lieux Paramètres de lieu Tiroir de navigation diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index cedce0260..54ccbc153 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -399,8 +399,6 @@ Estilo e apariencia Avanzada Lugares - As cores desaturaranse nos estilos escuros - As cores non se desaturan nos estilos escuros Configuración de posición Agochar etiquetas sen usar Agochar lugares sen usar diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 298b59e77..8e11db6d0 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -144,9 +144,6 @@ Sakrij nekorištena mjesta Postavke mjesta Mjesta - Boje neće biti nezasićene u tamnim temama - Boje će biti nezasićene u tamnim temama - Nezasićene boje Krug boja Samo ikona Samo tekst diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0611e0f87..a404b9cf3 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -429,9 +429,6 @@ Vissza Jelölő Jelölő kinézete - Fakó színek - Sötét téma esetén fakóbbak a színek - Sötét téma esetén élénk színek Helyek Hely beállítások Használaton kívüli címkék elrejtése diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 80170b522..c7d8fbcf0 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -517,9 +517,6 @@ Sembunyikan tempat yang tidak digunakan Pengaturan tempat Tempat - Warna tidak akan dikurangi/desaturasi dalam tema gelap - Warna akan dikurangi/desaturasi dalam tema gelap - Pengurangan/desaturasi warna Chip Roda warna Tampilkan notifikasi pada alat wearable Anda diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 9c89e1397..117140341 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -395,7 +395,6 @@ Nome visualizzato Aggiungi attività secondaria Personalizzato - Riduci saturazione colori Condividi Seleziona tutto Creato evento nel calendario per %s @@ -412,8 +411,6 @@ Menù laterale Impostazioni luogo Luoghi - I colori perderanno saturazione nei temi scuri - I colori non perderanno saturazione nei temi scuri Indietro 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 Ciao! Mi chiamo Alex. Sono lo sviluppatore indipendente di Tasks diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 0c5867ac6..d5eebcbfb 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -536,9 +536,6 @@ %s נערך %s נוצר סנכרון המשימות שלך עם היישומון DAVx⁵ - הצבעים יאפירו בערכות צבע כהות - הצבעים לא יאפירו בערכות צבע כהות - האפרת צבעים מראה הצ׳יפ צ׳יפים חשבון diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ff3bda577..395703265 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -508,7 +508,6 @@ オープンインターネット標準による同期 エンドツーエンド暗号化による同期 個人用 Microsoftアカウントと同期する - ダークテーマの使用時に彩度は下がりません 文字とアイコン 文字のみ 時間を選択 @@ -569,7 +568,6 @@ ドキュメント カラーホイール 通知音、バイブレーションなど - 彩度を下げる ウェアラブルデバイスに通知を表示する タスクリスト 警告: Tasks を削除すると %s にあるファイルも削除されます。ファイルの削除を回避するには、別の場所を指定してください。 @@ -645,7 +643,6 @@ 平均以上 着手日時あり チップの外観 - ダークテーマの使用時に彩度が下がります 変更: %s 着手: %s 締切: %s diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 306b8c9cb..bf076474b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -425,9 +425,6 @@ 장소 설정 장소 안녕하세요! Tasks의 1인 개발자 알렉스입니다 - 다크 테마 사용 시 채도를 낮춥니다 - 다크 테마 사용 시 채도를 낮추지 않습니다 - 저채도 색상 칩 모양 저는 Tasks 개발에 엄청나게 많은 시간을 쏟고 있으며, 모든 소스코드를 웹에 무상으로 공개하고 있습니다. 저의 작업을 후원하기 위해 일부 기능은 구독이 필요합니다 diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 8b90f18d5..ef174cb04 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -625,9 +625,6 @@ Automatiškai uždaryti renkantis iš užduoties redagavimo Užduoties redagavimas Spalvos pasirinkimo ratas - Tamsiose temose spalvos bus nublankę - Tamsiose temose spalvos nebus nublankę - Blankios spalvos Skrituliuko išvaizda Skrituliukai Valdiklio ID: %d diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 472b53ab4..07104bf29 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -463,9 +463,6 @@ Skjul ubrukte steder Skjul ubrukte etiketter Navigasjonsskuff - Farger vil ikke miste metning i mørke drakter - Farger vil miste metning i mørke drakter - Gi farger mindre metning Flisutseende Flis 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 diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2acf535c1..1790da00b 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -429,9 +429,6 @@ Terug Vormgeving Uiterlijk van chip - Minder verzadigde kleuren - Minder verzadigde kleuren in donkere thema\'s - Niet minder verzadigde kleuren in donkere thema\'s Locaties Locatie instellen Menu diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2c961cc15..b64584f46 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -445,9 +445,6 @@ Wstecz Chipy Wygląd chipów - Desaturuj kolory - Kolory będą desaturowane w ciemnych motywach - Kolory nie będą desaturowane w ciemnych motywach Wybierz czas Brak czasu Brak daty diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 3cc74b2ed..dea39cfa7 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -412,9 +412,6 @@ Menu de navegação Configuração de lugares Locais - Cores não serão dessaturadas em temas escuros - Cores serão dessaturadas em temas escuros - Dessaturar cores Aparência da Pastilha Pastilha Voltar diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 1eb99e5dd..928f1b667 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -446,9 +446,6 @@ Gaveta de navegação Configuração de locais Locais - As cores não serão dessaturadas em temas escuros - As cores serão dessaturadas em temas escuros - Dessaturar cores Aparência da ficha Fichas Voltar diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index e1c8133b6..f3f69ac8f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -547,9 +547,6 @@ Sertar de navigare Setări de locație Locuri - Culorile nu vor fi desaturate în temele întunecate - Culorile vor fi desaturate în temele întunecate - Desaturare culori Aspect fragmentat Fragmente Înapoi diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c58e177a0..f5a6aa5ff 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -451,9 +451,6 @@ Назад Индикаторы Внешний вид индикаторов - Уменьшить насыщенность цветов - Цвета будут менее насыщенными в темных темах - Цвета не будут менее насыщенными в темных темах Выбрать время Без времени Без даты diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index 601de9d08..3b288c4b1 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -23,8 +23,6 @@ %s සඳහා දින දර්ශන සිදුවීම නිර්මාණය කරන ලදි විජට් කාර්ය සංස්කරණය - අඳුරු තේමාවන් වලදී වර්ණ අසංතෘප්ත නොවේ - අවිනිශ්චිත වර්ණ චිප් පෙනුම කාලය %s @@ -631,7 +629,6 @@ පෙරබිම ස්ථානය මෙනුව ස්ථාන සැකසුම් - අඳුරු තේමාවන් වලදී වර්ණ අසංතෘප්ත වේ %1$s, %2$s සඳහා නැවත සකස් කරන ලදි අවම වශයෙන් ප්‍රමුඛතාවය \? ලිබරා චැට් හි #කාර්යයන් හා සම්බන්ධ වන්න diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 2450ae98f..f7fc93b64 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -549,12 +549,9 @@ Stäng automatiskt vid val från uppgiftslistan Uppgiftslista Automatisk stängning av datum- och tidsväljare - Färgerna kommer att avmattas i mörka teman Dölj oanvända platser Dölj oanvända taggar Navigeringslåda - Färger avmattas inte i mörka teman - Avmatta färger Utseende av flis Pommes frites Hej! Jag heter Alex. Jag är den oberoende utvecklaren bakom Tasks diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index d5d97fdcb..e5d1266ff 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -177,9 +177,6 @@ பயன்படுத்தப்படாத குறிச்சொற்களை மறைக்கவும் அமைப்புகளை வைக்கவும் இடங்கள் - இருண்ட கருப்பொருள்களில் நிறங்கள் அழிக்கப்படாது - இருண்ட கருப்பொருள்களில் நிறங்கள் தேய்மானம் செய்யப்படும் - தேய்மான நிறங்கள் சிப் தோற்றம் மீண்டும் நான் பணிகளில் ஆயிரக்கணக்கான மணிநேரங்களை செலவிட்டேன், மேலும் மூலக் குறியீடு அனைத்தையும் ஆன்லைனில் இலவசமாக வெளியிடுகிறேன். எனது பணியை ஆதரிக்க சில அம்சங்களுக்கு சந்தா தேவை diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 168e5418d..2a7dd8577 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -143,9 +143,6 @@ ลําดับความสําคัญสูง เพิ่มแท็ก สถานที่ - สีจะไม่ถูก desaturated ในธีมสีเข้ม - สีจะถูก desaturated ในธีมสีเข้ม - สีที่อิ่มตัว ลักษณะชิป เศษ กลับ diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 63fee4bfc..02fe48e5f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -434,9 +434,6 @@ Geri Yongalar Yonga görünümü - Renkleri solgunlaştır - Renkler karanlık gövdelerde solgunlaştırılacak - Renkler karanlık gövdelerde solgunlaştırılmayacak Yerler Yer ayarları Gezinim çekmecesi diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3ac56429e..9fe58ce3e 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -417,9 +417,6 @@ Зовнішній вигляд Розширені Показати розширені налаштування - Зменшити насиченість - Кольори не будуть ненасиченими в темних темах - Кольори будуть ненасиченими в темних темах За системними налаштуваннями %d підзавдання diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 98951f786..da75c28e8 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -199,9 +199,6 @@ Ngăn điều hướng Cài đặt địa điểm Địa điểm - Màu sắc sẽ không được khử bão hoà ở các chủ đề tối - Màu sắc sẽ được khử bão hoà ở các chủ đề tối - Khử bão hoà màu sắc Ngoại hình nhãn Nhãn Quay lại diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 4d0afce12..4bc8d56f1 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -424,9 +424,6 @@ 返回 纸片 纸片外观 - 降低颜色饱和度 - 在深色主题下,降低颜色饱和度 - 在深色主题下,不降低颜色饱和度 地点 地点设置 导航抽屉 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index db966fb47..47b77bd68 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -341,7 +341,6 @@ 僅文字 隱藏未使用地點 隱藏未使用標籤 - 暗色主題中顏色將不飽和 色輪 無效的使用者名稱或密碼 鈴聲、震動、與更多 @@ -578,7 +577,6 @@ 時鐘 解鎖所有主題、顏色和圖示 返回 - 在深色主題中將減淡顏色 位置設定 地點 Dashclock 擴充 @@ -634,7 +632,6 @@ 基本服務,與您的 Google 帳戶同步 端對端加密同步 嗨!我的名字是 Alex。我是 Tasks 背後的獨立開發者 - 減淡顏色 建立行事曆事件於 %s 小工具 ID:%d 完全存取 Tasks 資料庫 diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml index b1140ac41..862e9e806 100644 --- a/app/src/main/res/values/keys.xml +++ b/app/src/main/res/values/keys.xml @@ -389,7 +389,6 @@ chips_place chips_list chips_tag - desaturate_colors auto_dismiss_datetime_edit_screen auto_dismiss_datetime_list_screen auto_dismiss_datetime_widget diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8b3f49fa9..de15a2d07 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -548,9 +548,6 @@ File %1$s contained %2$s.\n\n Back Chips Chip appearance - Desaturate colors - Colors will be desaturated in dark themes - Colors will not be desaturated in dark themes Places Place settings Navigation drawer diff --git a/app/src/main/res/xml/preferences_look_and_feel.xml b/app/src/main/res/xml/preferences_look_and_feel.xml index 501ff046e..37106ffc9 100644 --- a/app/src/main/res/xml/preferences_look_and_feel.xml +++ b/app/src/main/res/xml/preferences_look_and_feel.xml @@ -19,13 +19,6 @@ android:key="@string/p_theme_launcher" android:title="@string/launcher_icon" /> - - 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