diff --git a/app/src/main/java/org/tasks/preferences/PermissionRequestor.java b/app/src/main/java/org/tasks/preferences/PermissionRequestor.java index 4f9e3436f..70eda8a54 100644 --- a/app/src/main/java/org/tasks/preferences/PermissionRequestor.java +++ b/app/src/main/java/org/tasks/preferences/PermissionRequestor.java @@ -19,14 +19,10 @@ public abstract class PermissionRequestor { } public boolean requestCalendarPermissions() { - return requestCalendarPermissions(REQUEST_CALENDAR); - } - - public boolean requestCalendarPermissions(int requestCode) { if (permissionChecker.canAccessCalendars()) { return true; } - requestPermissions(requestCode, permission.READ_CALENDAR, permission.WRITE_CALENDAR); + requestPermissions(REQUEST_CALENDAR, permission.READ_CALENDAR, permission.WRITE_CALENDAR); return false; } diff --git a/app/src/main/java/org/tasks/ui/CalendarControlSet.kt b/app/src/main/java/org/tasks/ui/CalendarControlSet.kt index 79b2403e7..1e9239c9c 100644 --- a/app/src/main/java/org/tasks/ui/CalendarControlSet.kt +++ b/app/src/main/java/org/tasks/ui/CalendarControlSet.kt @@ -4,67 +4,90 @@ import android.app.Activity import android.content.Intent import android.net.Uri import android.provider.CalendarContract -import android.view.View -import android.view.ViewGroup -import android.widget.TextView import android.widget.Toast.LENGTH_SHORT -import com.todoroo.astrid.gcal.GCalHelper +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.padding +import androidx.compose.material.ContentAlpha +import androidx.compose.material.Icon +import androidx.compose.material.IconButton +import androidx.compose.material.Text +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.Delete +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import dagger.hilt.android.AndroidEntryPoint -import org.tasks.PermissionUtil.verifyPermissions import org.tasks.R import org.tasks.Strings.isNullOrEmpty -import org.tasks.analytics.Firebase import org.tasks.calendars.CalendarPicker import org.tasks.calendars.CalendarProvider -import org.tasks.databinding.ControlSetGcalDisplayBinding -import org.tasks.dialogs.DialogBuilder +import org.tasks.compose.DisabledText +import org.tasks.compose.collectAsStateLifecycleAware import org.tasks.extensions.Context.toast -import org.tasks.preferences.FragmentPermissionRequestor import org.tasks.preferences.PermissionChecker -import org.tasks.preferences.Preferences -import org.tasks.themes.ThemeBase import timber.log.Timber import javax.inject.Inject @AndroidEntryPoint -class CalendarControlSet : TaskEditControlFragment() { - private lateinit var cancelButton: View - private lateinit var calendar: TextView - +class CalendarControlSet : TaskEditControlComposeFragment() { @Inject lateinit var activity: Activity - @Inject lateinit var gcalHelper: GCalHelper @Inject lateinit var calendarProvider: CalendarProvider - @Inject lateinit var preferences: Preferences @Inject lateinit var permissionChecker: PermissionChecker - @Inject lateinit var permissionRequestor: FragmentPermissionRequestor - @Inject lateinit var firebase: Firebase - @Inject lateinit var dialogBuilder: DialogBuilder - @Inject lateinit var themeBase: ThemeBase override fun onResume() { super.onResume() val canAccessCalendars = permissionChecker.canAccessCalendars() - viewModel.eventUri?.let { + viewModel.eventUri.value?.let { if (canAccessCalendars && !calendarEntryExists(it)) { - viewModel.eventUri = null + viewModel.eventUri.value = null } } if (!canAccessCalendars) { - viewModel.selectedCalendar = null + viewModel.selectedCalendar.value = null } - - refreshDisplayView() } - override fun bind(parent: ViewGroup?) = - ControlSetGcalDisplayBinding.inflate(layoutInflater, parent, true).let { - cancelButton = it.clear.clear.apply { - setOnClickListener { clearCalendar() } + @Composable + override fun Body() { + val eventUri = viewModel.eventUri.collectAsStateLifecycleAware().value + val selectedCalendar = + viewModel.selectedCalendar.collectAsStateLifecycleAware().value?.let { + calendarProvider.getCalendar(it)?.name + } + if (eventUri?.isNotBlank() == true) { + Row { + Text( + text = stringResource(id = R.string.gcal_TEA_showCalendar_label), + modifier = Modifier + .weight(1f) + .padding(vertical = 20.dp) + ) + IconButton( + onClick = { clear() }, + Modifier.padding(vertical = 8.dp), + ) { + Icon( + imageVector = Icons.Outlined.Delete, + contentDescription = stringResource(id = R.string.delete), + modifier = Modifier.alpha(ContentAlpha.medium), + ) + } } - calendar = it.calendarDisplayWhich - it.root + } else if (selectedCalendar?.isNotBlank() == true) { + Text( + text = selectedCalendar, + modifier = Modifier.padding(vertical = 20.dp), + ) + } else { + DisabledText( + text = stringResource(id = R.string.dont_add_to_calendar), + modifier = Modifier.padding(vertical = 20.dp), + ) } + } override val icon = R.drawable.ic_outline_event_24px @@ -72,40 +95,23 @@ class CalendarControlSet : TaskEditControlFragment() { override val isClickable = true - private fun clearCalendar() { - if (viewModel.eventUri.isNullOrBlank()) { - clear() - } else { - dialogBuilder - .newDialog(R.string.delete_calendar_event_confirmation) - .setPositiveButton(R.string.delete) { _, _ -> - if (permissionRequestor.requestCalendarPermissions(REQUEST_CODE_CLEAR_EVENT)) { - clear() - } - } - .setNegativeButton(R.string.cancel, null) - .show() - } - } - private fun clear() { - viewModel.selectedCalendar = null - viewModel.eventUri = null - refreshDisplayView() + viewModel.selectedCalendar.value = null + viewModel.eventUri.value = null } override fun onRowClick() { - if (viewModel.eventUri.isNullOrBlank()) { + if (viewModel.eventUri.value.isNullOrBlank()) { CalendarPicker.newCalendarPicker(this, REQUEST_CODE_PICK_CALENDAR, calendarName) .show(parentFragmentManager, FRAG_TAG_CALENDAR_PICKER) - } else if (permissionRequestor.requestCalendarPermissions(REQUEST_CODE_OPEN_EVENT)) { + } else { openCalendarEvent() } } private fun openCalendarEvent() { val cr = activity.contentResolver - val uri = Uri.parse(viewModel.eventUri) + val uri = Uri.parse(viewModel.eventUri.value) val intent = Intent(Intent.ACTION_VIEW, uri) try { cr.query( @@ -115,8 +121,7 @@ class CalendarControlSet : TaskEditControlFragment() { null).use { cursor -> if (cursor!!.count == 0) { activity.toast(R.string.calendar_event_not_found, duration = LENGTH_SHORT) - viewModel.eventUri = null - refreshDisplayView() + viewModel.eventUri.value = null } else { cursor.moveToFirst() intent.putExtra(CalendarContract.EXTRA_EVENT_BEGIN_TIME, cursor.getLong(0)) @@ -133,8 +138,7 @@ class CalendarControlSet : TaskEditControlFragment() { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == REQUEST_CODE_PICK_CALENDAR) { if (resultCode == Activity.RESULT_OK) { - viewModel.selectedCalendar = data!!.getStringExtra(CalendarPicker.EXTRA_CALENDAR_ID) - refreshDisplayView() + viewModel.selectedCalendar.value = data!!.getStringExtra(CalendarPicker.EXTRA_CALENDAR_ID) } } else { super.onActivityResult(requestCode, resultCode, data) @@ -142,37 +146,7 @@ class CalendarControlSet : TaskEditControlFragment() { } private val calendarName: String? - get() = viewModel.selectedCalendar?.let { calendarProvider.getCalendar(it)?.name } - - override fun onRequestPermissionsResult( - requestCode: Int, permissions: Array, grantResults: IntArray) { - if (requestCode == REQUEST_CODE_OPEN_EVENT) { - if (verifyPermissions(grantResults)) { - openCalendarEvent() - } - } else if (requestCode == REQUEST_CODE_CLEAR_EVENT) { - if (verifyPermissions(grantResults)) { - clear() - } - } else { - super.onRequestPermissionsResult(requestCode, permissions, grantResults) - } - } - - private fun refreshDisplayView() = when { - viewModel.eventUri?.isNotBlank() == true -> { - calendar.setText(R.string.gcal_TEA_showCalendar_label) - cancelButton.visibility = View.VISIBLE - } - !viewModel.selectedCalendar.isNullOrBlank() -> { - calendar.text = calendarName - cancelButton.visibility = View.GONE - } - else -> { - calendar.text = null - cancelButton.visibility = View.GONE - } - } + get() = viewModel.selectedCalendar.value?.let { calendarProvider.getCalendar(it)?.name } private fun calendarEntryExists(eventUri: String?): Boolean { if (isNullOrEmpty(eventUri)) { @@ -197,7 +171,5 @@ class CalendarControlSet : TaskEditControlFragment() { const val TAG = R.string.TEA_ctrl_gcal private const val FRAG_TAG_CALENDAR_PICKER = "frag_tag_calendar_picker" private const val REQUEST_CODE_PICK_CALENDAR = 70 - private const val REQUEST_CODE_OPEN_EVENT = 71 - private const val REQUEST_CODE_CLEAR_EVENT = 72 } } \ No newline at end of file diff --git a/app/src/main/java/org/tasks/ui/LocationControlSet.kt b/app/src/main/java/org/tasks/ui/LocationControlSet.kt index d04b2317b..7314a15f4 100644 --- a/app/src/main/java/org/tasks/ui/LocationControlSet.kt +++ b/app/src/main/java/org/tasks/ui/LocationControlSet.kt @@ -7,6 +7,7 @@ import android.os.Parcelable import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.padding +import androidx.compose.material.ContentAlpha import androidx.compose.material.Icon import androidx.compose.material.IconButton import androidx.compose.material.Text @@ -15,6 +16,7 @@ import androidx.compose.material.icons.outlined.Notifications import androidx.compose.material.icons.outlined.NotificationsOff import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.core.util.Pair @@ -207,7 +209,8 @@ fun LocationRow( } else { Icons.Outlined.NotificationsOff }, - contentDescription = null + contentDescription = null, + modifier = Modifier.alpha(ContentAlpha.medium), ) } } diff --git a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt index 66b7fedbf..37c47a474 100644 --- a/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt +++ b/app/src/main/java/org/tasks/ui/TaskEditViewModel.kt @@ -117,8 +117,7 @@ class TaskEditViewModel @Inject constructor( if (isNew && permissionChecker.canAccessCalendars()) { originalCalendar = preferences.defaultCalendar } - eventUri = task.calendarURI - + eventUri.value = task.calendarURI priority.value = task.priority } @@ -222,12 +221,12 @@ class TaskEditViewModel @Inject constructor( var originalCalendar: String? = null private set(value) { field = value - selectedCalendar = value + selectedCalendar.value = value } - var selectedCalendar: String? = null + var selectedCalendar = MutableStateFlow(null) - var eventUri: String? = null + var eventUri = MutableStateFlow(null) var isNew: Boolean = false private set @@ -302,11 +301,11 @@ class TaskEditViewModel @Inject constructor( } || task.repeatAfterCompletion() != repeatAfterCompletion || task.repeatUntil != repeatUntil || - originalCalendar != selectedCalendar || + originalCalendar != selectedCalendar.value || if (task.calendarURI.isNullOrBlank()) { - !eventUri.isNullOrBlank() + !eventUri.value.isNullOrBlank() } else { - task.calendarURI != eventUri + task.calendarURI != eventUri.value } || task.elapsedSeconds != elapsedSeconds || task.estimatedSeconds != estimatedSeconds || @@ -446,13 +445,13 @@ class TaskEditViewModel @Inject constructor( if (!permissionChecker.canAccessCalendars()) { return } - if (eventUri == null) { + if (eventUri.value == null) { calendarEventProvider.deleteEvent(task) } if (!task.hasDueDate()) { return } - selectedCalendar?.let { + selectedCalendar.value?.let { try { task.calendarURI = gCalHelper.createTaskEvent(task, it)?.toString() } catch (e: Exception) { diff --git a/app/src/main/res/layout/control_set_gcal_display.xml b/app/src/main/res/layout/control_set_gcal_display.xml deleted file mode 100644 index 7ce40fd7e..000000000 --- a/app/src/main/res/layout/control_set_gcal_display.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 5b3af988a..3be71ef2a 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -314,7 +314,6 @@ أنشأ قائمةً جديدة أنشأ علامةً جديدة غفو الكل - حذف حدث التقويم؟ اسم العلامة يحتوي… علامة… الموقع الافتراضي diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 539804358..6aeea2acd 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -122,7 +122,6 @@ Заглавието съдържа: \? Грешка при добавяне на задача в календара! Добавяне на събитие в календара - Изтриване на събитие от календара\? Събитието от календара не е намерено %s (завършено) В списъка: \? diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 8e4ae6f84..75ebdba41 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -169,7 +169,6 @@ A la sortida A l’arribada i sortida A la llista GTasks… - Esborrar esdeveniment de calendari\? No es repeteix Cada dia Qualsevol data d\'inici diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 0225c78d9..50fc7a0e2 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -97,7 +97,6 @@ Název obsahuje: \? Chyba při přidávání úkolu do kalendáře! Otevřít událost v kalendáři - Smazat událost v kalendáři? %s (dokončeno) V seznamu: ? V seznamu Google úkolů… diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index dbbf3eed4..3c52542d9 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -491,7 +491,6 @@ På listen… På listen: \? Kalenderbegivenhed ikke fundet - Slet kalenderbegivenhed\? Tag indeholder: \? Tag indeholder… Tag… diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 53c13a7b9..b084f10d6 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -116,7 +116,6 @@ Titel enthält: ? Fehler beim Hinzufügen der Aufgabe zum Kalender! Kalendereintrag öffnen - Kalendereintrag löschen? Kalendereintrag nicht gefunden %s (abgeschlossen) In der Liste: ? diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index a60ef1d20..bf854b15e 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -151,7 +151,6 @@ En GTasks Listo… En Listo: \? Kalendara evento ne trovita - Ĉu forigi kalendara evento\? Malfermi Kalendara Evento Titolo enhavas: \? Titolo enhavas… diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index e1a469165..87fe94d96 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -116,7 +116,6 @@ Título contiene: ? ¡Ocurrió un error al agregar la tarea al calendario! Abrir evento del calendario - ¿Borrar evento de calendario? Evento de calendario no encontrado %s (completado) En la Lista: ? diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 15aeb5d30..53981308e 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -92,7 +92,6 @@ Pealkirjas on: \? Tõrge ülesande lisamisel kalendrisse! Ava kalendri sündmus - Kustutada kalendri sündmus\? Kalendri sündmust ei leitud %s (valmis) Nimekirjas: \? diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 07536d450..b9f2b79f4 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -117,7 +117,6 @@ Izenburuak hau du: \? Errorea zeregina egutegira gehitzean! Ireki egutegiko gertaera - Ezabatu egutegiko gertaera\? Ez da egutegiko gertaera aurkitu %s (burututa) Zerrendan: \? diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 944be918c..276b87bce 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -107,7 +107,6 @@ Otsikko sisältää: ? Virhe! Lisättäessä tehtävää kalenteriin! Avaa kalenteritapahtuma - Poista kalenteritapahtuma\? Kalenteritapahtumaa ei löydy %s (valmistunut) Listalla: ? diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 1978b0299..a21ff4312 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -109,7 +109,6 @@ Titre contient : \? Erreur d\'ajout de tâche à l\'agenda ! Ouvrir l\'évènement de l\'agenda - Supprimer l\'évènement \? Événement non trouvé %s (complété) Dans la liste : ? diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 70476f36e..11366ffa8 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -113,7 +113,6 @@ O título contén: \? Erro ao engadir a tarefa ao calendario! Abrir evento de calendario - Borrar evento do calendario\? Evento de calendario non atopado %s (finalizado) Na lista: \? diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 829a0a731..2b8dedadd 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -498,7 +498,6 @@ U popisu: \? %s (obavljeno) Kalendarski događaj nije pronađen - Izbrisati kalendarski događaj\? Otvori kalendarski događaj Naslov sadrži: \? Naslov sadrži … diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 183e3b24b..41418e170 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -115,7 +115,6 @@ A név tartalmazza ezt: ? Nem sikerült a feladat hozzáadása a naptárhoz! Naptáresemény megnyitása - Naptárbejegyzés törlése? Naptáresemény nem található %s (befejezve) Listában: ? diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index 8ebf9b398..1541a579f 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -80,7 +80,6 @@ Nama tag memuat: \? Terjadi kesalahan saat menambahkan tugas ke kalender! Buka Acara Kalender - Hapus acara kalender\? Acara kalender tidak ditemukan %s (selesai) Dalam Daftar: \? diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 13219448a..8d863f629 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -117,7 +117,6 @@ Il titolo contiene: ? Errore durante l\'aggiunta dell\'attività al calendario! Apri evento del calendario - Cancellare l\'evento dal calendario\? Evento non trovato %s (completato) Nella lista: ? diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 5483195ae..ce1d10e13 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -117,7 +117,6 @@ כותרת מכילה: ? שגיאה בהוספת המשימה ליומן! פתח אירוע ביומן - למחוק אירוע ? אירוע לא נמצא %s (בוצעה) ברשימה: ? diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 03149e419..542772d16 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -117,7 +117,6 @@ タイトルに含む: \? カレンダーへの登録に失敗しました! カレンダーのイベントを開く - カレンダーイベントを削除しますか? カレンダーイベントが見つかりません %s(完了) リストにある: \? diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c7da690c0..97cef374f 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -115,7 +115,6 @@ 제목이 다음을 포함: ? 달력에 할일 추가 실패! 달력 일정 열기 - 달력 일정을 삭제할까요\? 달력 일정이 발견되지 않음 %s (완료) 목록에: ? diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 5f7b24778..0ee323b32 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -122,7 +122,6 @@ Pavadinimas turi: ? Klaida pridedant užduotį prie kalendoriaus! Atidaryti kalendoriaus įvykį - Ištrinti kalendoriau įvykį? Kalendoriaus įvykis nerastas %s (užbaigta) Yra sąraše ? diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 7f3465dc9..ee6916910 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -213,7 +213,6 @@ Etikett… Etikettnavn inneholder… Etikettnavn inneholder: \? - Slett kalenderhendelse\? Fant ikke kalenderhendelsen I GTasks-listen… Identitetsbekrefter… diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 28fddc203..cd16a6c10 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -116,7 +116,6 @@ Naam bevat: ? Fout bij toevoegen taak aan kalender! Kalender-item openen - Kalender-item wissen\? Kalender-item niet gevonden %s (voltooid) In de lijst: \? diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0318ecfd4..98b5089a8 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -111,7 +111,6 @@ Tytuł zawiera: ? Błąd podczas dodawania zadania do kalendarza! Otwórz zdarzenie kalendarza - Usunąć zdarzenie kalendarza? Zdarzenie kalendarza nie odnazlezione %s (ukończono) Na liście: ? diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ef6e1869f..2d9d13565 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -112,7 +112,6 @@ Título contem: ? Erro ao inserir a tarefa no calendário! Abrir evento no calendário - Excluir evento no calendário? Evento no calendário não encontrado %s (concluído) Na lista: ? diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 433a92dc2..14fa026c3 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -107,7 +107,6 @@ Título contém: ? Erro ao adicionar tarefa ao calendário! Abrir evento no calendário - Eliminar evento do calendário\? Não foi encontrado o evento no calendário %s (terminada) Na lista: ? diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 8d84fb1ce..de71aa67c 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -412,7 +412,6 @@ În listă: \? %s (finalizat) Evenimentul din calendar nu a fost găsit - Eliminare eveniment calendaristic\? Deschidere eveniment calendaristic Eroare la adăugarea sarcinii în calendar! Titlul conține: \? diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5848a6a15..204cb1677 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -117,7 +117,6 @@ Название содержит: ? Ошибка при добавлении задачи в календарь! Открыть событие календаря - Удалить событие календаря\? Событие календаря не найдено %s (выполнено) В списке: \? diff --git a/app/src/main/res/values-si/strings.xml b/app/src/main/res/values-si/strings.xml index ca3aaebe9..4f8f239cf 100644 --- a/app/src/main/res/values-si/strings.xml +++ b/app/src/main/res/values-si/strings.xml @@ -372,7 +372,6 @@ සත්‍යාපනය… %s (සම්පූර්ණයි) දින දර්ශන සිදුවීම සොයාගැනීමට නොහැකිවිය - දින දර්ශන සිදුවීම මකා දමන්නද\? දින දර්ශන කාර්යය විවෘත කරන්න දින දර්ශනයට කාර්යය එකතු කිරීමේදී දෝෂයක් ඇති විය! ප්‍රමුඛතාවය… diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 4d5375c98..dba52b153 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -117,7 +117,6 @@ Zoznam obsahuje: ? Chyba pridania úlohy do kalendára! Otvoriť udalosť kalendára - Zmazať udalosť z kalendára? Udalosť kalendára nenájdená %s (dokončené) V zozname: ? diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 857ce8406..d71326a03 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -107,7 +107,6 @@ Titeln innehåller: ? Misslyckades med att lägga uppgift till kalender! Öppna kalenderhändelse - Ta bort kalenderhändelse? Kalenderhändelsen hittades inte %s (slutförd) I listan: ? diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index cddcb2498..9023d6aeb 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -124,7 +124,6 @@ பட்டியலில் :\? %s (முடிந்தது) நாள்காட்டி நிகழ்வு கிடைக்கவில்லை - நாள்காட்டி நிகழ்வை நீக்கவா\? நாள்காட்டி நிகழ்வைத் திறக்கவும் தலைப்பில்:\? தலைப்பில்… diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index cd801f2fb..a4ffa9478 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -518,7 +518,6 @@ ในรายการ GTasks… ในรายการ: \? ไม่พบเหตุการณ์ในปฏิทิน - ลบเหตุการณ์ในปฏิทินหรือไม่\? เกิดข้อผิดพลาดในการเพิ่มงานในปฏิทิน! ชื่อแท็กประกอบด้วย: \? ชื่อแท็กมี… diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 53405d893..02e798e4f 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -117,7 +117,6 @@ Başlık şunu içersin: ? Takvime görev eklenmesinde hata! Takvim Olayı Aç - Takvim etkinliğini sil? Takvim etkinliği bulunamadı %s (tamamlandı) Liste içinde: ? diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index dd427e6f7..f8189e3f6 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -117,7 +117,6 @@ Заголовок містить: ? Помилка додавання завдання до календаря! Відкрити подію у календарі - Видалити подію з календаря\? Подію у календарі не знайдено %s (завершено) У списку: \? diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index e6f7ff862..ae60db681 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -139,7 +139,6 @@ لسٹ میں:? %s مکمل ہو گیا کیلنڈر ایونٹ نہیں مل سکا - کیلنڈر ایونٹ ڈیلیٹ کریں؟ کیلنڈر ایونٹ کھولیں کیلنڈر میں کام شامل کرنے میں خرابی! ہر ایک diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 1e59667d7..2487e9c35 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -604,7 +604,6 @@ Trong danh sách: \? %s (đã hoàn thành) Không tìm thấy sự kiện trong lịch - Xoá sự kiện trong lịch\? Mở sự kiện trong lịch Lỗi khi thêm công việc vào lịch! Tiêu đề chứa: \? diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index ceadbf02b..633a53c3f 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -106,7 +106,6 @@ 标题含:? 将任务添加到日历时发生错误! 打开日程表事件 - 是否删除日历事件? 找不到日历事件 %s (已完成) 列表内容:? diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 847aa6c0b..60a635bf8 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -289,7 +289,6 @@ 全部延遲提醒 在清單中… 找不到日曆活動 - 要刪除日曆活動嗎 \? 標註名稱包含: \? 標註名稱包含… 標籤… diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d49615b1f..626f370fd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -137,7 +137,6 @@ File %1$s contained %2$s.\n\n Title contains: ? Error adding task to calendar! Open Calendar Event - Delete calendar event? Calendar event not found %s (completed) In List: ?