diff --git a/app/src/main/java/com/nextcloud/client/assistant/AssistantViewModel.kt b/app/src/main/java/com/nextcloud/client/assistant/AssistantViewModel.kt index 4ec4601a96..579e0233a8 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/AssistantViewModel.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/AssistantViewModel.kt @@ -7,26 +7,24 @@ */ package com.nextcloud.client.assistant -import android.content.Context import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.nextcloud.client.assistant.model.ScreenOverlayState import com.nextcloud.client.assistant.model.ScreenState import com.nextcloud.client.assistant.repository.AssistantRepositoryType +import com.nextcloud.client.assistant.taskTypes.model.AssistantTaskType +import com.nextcloud.client.assistant.taskTypes.model.toAssistantTaskTypeList import com.owncloud.android.R import com.owncloud.android.lib.resources.assistant.model.Task -import com.owncloud.android.lib.resources.assistant.model.TaskType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import java.lang.ref.WeakReference class AssistantViewModel( private val repository: AssistantRepositoryType, - private val context: WeakReference ) : ViewModel() { private val _screenState = MutableStateFlow(null) @@ -38,11 +36,11 @@ class AssistantViewModel( private val _snackbarMessageId = MutableStateFlow(null) val snackbarMessageId: StateFlow = _snackbarMessageId - private val _selectedTaskType = MutableStateFlow(null) - val selectedTaskType: StateFlow = _selectedTaskType + private val _selectedTaskType = MutableStateFlow(null) + val selectedTaskType: StateFlow = _selectedTaskType - private val _taskTypes = MutableStateFlow?>(null) - val taskTypes: StateFlow?> = _taskTypes + private val _taskTypes = MutableStateFlow?>(null) + val taskTypes: StateFlow?> = _taskTypes private var taskList: List? = null @@ -51,7 +49,6 @@ class AssistantViewModel( init { fetchTaskTypes() - fetchTaskList() } @Suppress("MagicNumber") @@ -72,27 +69,22 @@ class AssistantViewModel( } } - fun selectTaskType(task: TaskType) { + fun selectTaskType(task: AssistantTaskType) { _selectedTaskType.update { - filterTaskList(task.id) task } - updateScreenState() + fetchTaskList() } private fun fetchTaskTypes() { viewModelScope.launch(Dispatchers.IO) { - val allTaskType = context.get()?.getString(R.string.assistant_screen_all_task_type) - val excludedIds = listOf("OCA\\ContextChat\\TextProcessing\\ContextChatTaskType") - val result = arrayListOf(TaskType(null, allTaskType, null)) val taskTypesResult = repository.getTaskTypes() if (taskTypesResult.isSuccess) { - val excludedTaskTypes = taskTypesResult.resultData.types.filter { item -> item.id !in excludedIds } - result.addAll(excludedTaskTypes) + val result = taskTypesResult.resultData.toAssistantTaskTypeList() _taskTypes.update { - result.toList() + result } selectTaskType(result.first()) @@ -102,16 +94,21 @@ class AssistantViewModel( } } - fun fetchTaskList(appId: String = "assistant") { + fun fetchTaskList() { viewModelScope.launch(Dispatchers.IO) { _screenState.update { ScreenState.Refreshing } - val result = repository.getTaskList(appId) + val taskType = _selectedTaskType.value?.id ?: return@launch + val result = repository.getTaskList(taskType) if (result.isSuccess) { - taskList = result.resultData.tasks - filterTaskList(_selectedTaskType.value?.id) + taskList = result.resultData.tasks.filter { it.appId == "assistant" } + _filteredTaskList.update { + taskList?.sortedByDescending { task -> + task.id + } + } updateSnackbarMessage(null) } else { updateSnackbarMessage(R.string.assistant_screen_task_list_error_state_message) @@ -161,24 +158,6 @@ class AssistantViewModel( } } - private fun filterTaskList(taskTypeId: String?) { - if (taskTypeId == null) { - _filteredTaskList.update { - taskList - } - } else { - _filteredTaskList.update { - taskList?.filter { it.type == taskTypeId } - } - } - - _filteredTaskList.update { - it?.sortedByDescending { task -> - task.id - } - } - } - private fun removeTaskFromList(id: Long) { _filteredTaskList.update { currentList -> currentList?.filter { it.id != id } diff --git a/app/src/main/java/com/nextcloud/client/assistant/AsssistantScreen.kt b/app/src/main/java/com/nextcloud/client/assistant/AsssistantScreen.kt index e21fad6f46..45c14c38dc 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/AsssistantScreen.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/AsssistantScreen.kt @@ -34,7 +34,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -45,18 +44,17 @@ import com.nextcloud.client.assistant.model.ScreenState import com.nextcloud.client.assistant.repository.AssistantMockRepository import com.nextcloud.client.assistant.task.TaskView import com.nextcloud.client.assistant.taskTypes.TaskTypesRow +import com.nextcloud.client.assistant.taskTypes.model.AssistantTaskType import com.nextcloud.ui.composeActivity.ComposeActivity import com.nextcloud.ui.composeComponents.alertDialog.SimpleAlertDialog import com.nextcloud.ui.composeComponents.bottomSheet.MoreActionsBottomSheet import com.nextcloud.utils.extensions.showShareIntent import com.owncloud.android.R import com.owncloud.android.lib.resources.assistant.model.Task -import com.owncloud.android.lib.resources.assistant.model.TaskType import com.owncloud.android.utils.ClipboardUtil import com.owncloud.android.utils.DisplayUtils import kotlinx.coroutines.delay import kotlinx.coroutines.launch -import java.lang.ref.WeakReference @Suppress("LongMethod") @OptIn(ExperimentalMaterial3Api::class) @@ -88,15 +86,13 @@ fun AssistantScreen(viewModel: AssistantViewModel, activity: Activity) { ShowLinearProgressIndicator(screenState, pullRefreshState) - if (selectedTaskType?.name != stringResource(id = R.string.assistant_screen_all_task_type)) { - AddFloatingActionButton( - modifier = Modifier - .align(Alignment.BottomEnd) - .padding(16.dp), - selectedTaskType, - viewModel - ) - } + AddFloatingActionButton( + modifier = Modifier + .align(Alignment.BottomEnd) + .padding(16.dp), + selectedTaskType, + viewModel + ) } showSnackBarMessage(messageId, activity, viewModel) @@ -106,8 +102,8 @@ fun AssistantScreen(viewModel: AssistantViewModel, activity: Activity) { @Composable private fun ShowScreenState( screenState: ScreenState?, - selectedTaskType: TaskType?, - taskTypes: List?, + selectedTaskType: AssistantTaskType?, + taskTypes: List?, viewModel: AssistantViewModel, filteredTaskList: List? ) { @@ -147,7 +143,7 @@ private fun ShowLinearProgressIndicator(screenState: ScreenState?, pullToRefresh } @Composable -private fun AddFloatingActionButton(modifier: Modifier, selectedTaskType: TaskType?, viewModel: AssistantViewModel) { +private fun AddFloatingActionButton(modifier: Modifier, selectedTaskType: AssistantTaskType?, viewModel: AssistantViewModel) { FloatingActionButton( modifier = modifier, onClick = { @@ -222,7 +218,7 @@ private fun ShowOverlayState( R.drawable.ic_edit, R.string.action_edit ) { - val taskType = TaskType( + val taskType = AssistantTaskType( state.task.type, activity.getString(R.string.assistant_screen_add_task_alert_dialog_title), null @@ -248,8 +244,8 @@ private fun ShowOverlayState( @Composable private fun AssistantContent( taskList: List, - taskTypes: List?, - selectedTaskType: TaskType?, + taskTypes: List?, + selectedTaskType: AssistantTaskType?, viewModel: AssistantViewModel ) { LazyColumn( @@ -282,15 +278,11 @@ private fun AssistantContent( } @Composable -private fun EmptyTaskList(selectedTaskType: TaskType?, taskTypes: List?, viewModel: AssistantViewModel) { - val text = if (selectedTaskType?.name == stringResource(id = R.string.assistant_screen_all_task_type)) { - stringResource(id = R.string.assistant_screen_no_task_available_for_all_task_filter_text) - } else { - stringResource( - id = R.string.assistant_screen_no_task_available_text, - selectedTaskType?.name ?: "" - ) - } +private fun EmptyTaskList(selectedTaskType: AssistantTaskType?, taskTypes: List?, viewModel: AssistantViewModel) { + val text = stringResource( + id = R.string.assistant_screen_no_task_available_text, + selectedTaskType?.name ?: "" + ) Column( modifier = Modifier @@ -314,10 +306,7 @@ private fun AssistantScreenPreview() { MaterialTheme( content = { AssistantScreen( - viewModel = AssistantViewModel( - repository = mockRepository, - context = WeakReference(LocalContext.current) - ), + viewModel = AssistantViewModel(repository = mockRepository), activity = ComposeActivity() ) } @@ -331,10 +320,7 @@ private fun AssistantEmptyScreenPreview() { MaterialTheme( content = { AssistantScreen( - viewModel = AssistantViewModel( - repository = mockRepository, - context = WeakReference(LocalContext.current) - ), + viewModel = AssistantViewModel(repository = mockRepository), activity = ComposeActivity() ) } diff --git a/app/src/main/java/com/nextcloud/client/assistant/model/ScreenOverlayState.kt b/app/src/main/java/com/nextcloud/client/assistant/model/ScreenOverlayState.kt index 23c6c44af7..8ef3410d76 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/model/ScreenOverlayState.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/model/ScreenOverlayState.kt @@ -7,11 +7,11 @@ package com.nextcloud.client.assistant.model +import com.nextcloud.client.assistant.taskTypes.model.AssistantTaskType import com.owncloud.android.lib.resources.assistant.model.Task -import com.owncloud.android.lib.resources.assistant.model.TaskType sealed class ScreenOverlayState { data class DeleteTask(val id: Long): ScreenOverlayState() - data class AddTask(val taskType: TaskType, val input: String): ScreenOverlayState() + data class AddTask(val taskType: AssistantTaskType, val input: String): ScreenOverlayState() data class TaskActions(val task: Task): ScreenOverlayState() } diff --git a/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantMockRepository.kt b/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantMockRepository.kt index a4066b746b..cf2e14e7b7 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantMockRepository.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantMockRepository.kt @@ -13,19 +13,13 @@ import com.owncloud.android.lib.resources.assistant.model.Task import com.owncloud.android.lib.resources.assistant.model.TaskInput import com.owncloud.android.lib.resources.assistant.model.TaskList import com.owncloud.android.lib.resources.assistant.model.TaskOutput -import com.owncloud.android.lib.resources.assistant.model.TaskType import com.owncloud.android.lib.resources.assistant.model.TaskTypes @Suppress("MagicNumber") class AssistantMockRepository(private val giveEmptyTasks: Boolean = false) : AssistantRepositoryType { override fun getTaskTypes(): RemoteOperationResult { return RemoteOperationResult(RemoteOperationResult.ResultCode.OK).apply { - resultData = TaskTypes( - listOf( - TaskType("1", "FreePrompt", "You can create free prompt text"), - TaskType("2", "Generate Headline", "You can create generate headline text") - ) - ) + resultData = null } } @@ -33,8 +27,7 @@ class AssistantMockRepository(private val giveEmptyTasks: Boolean = false) : Ass return RemoteOperationResult(RemoteOperationResult.ResultCode.OK) } - @Suppress("LongMethod") - override fun getTaskList(appId: String): RemoteOperationResult { + override fun getTaskList(taskType: String): RemoteOperationResult { val taskList = if (giveEmptyTasks) { TaskList(listOf()) } else { @@ -54,7 +47,6 @@ class AssistantMockRepository(private val giveEmptyTasks: Boolean = false) : Ass 1707692337, 1707692337, ), - ) ) } diff --git a/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepository.kt b/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepository.kt index 1cb32ff43c..1689ac021f 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepository.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepository.kt @@ -26,8 +26,8 @@ class AssistantRepository(private val client: NextcloudClient) : AssistantReposi return CreateTaskRemoteOperation(input, type).execute(client) } - override fun getTaskList(appId: String): RemoteOperationResult { - return GetTaskListRemoteOperation(appId).execute(client) + override fun getTaskList(taskType: String): RemoteOperationResult { + return GetTaskListRemoteOperation(taskType).execute(client) } override fun deleteTask(id: Long): RemoteOperationResult { diff --git a/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepositoryType.kt b/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepositoryType.kt index 8bb9808863..e8a0d2fb67 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepositoryType.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/repository/AssistantRepositoryType.kt @@ -16,7 +16,7 @@ interface AssistantRepositoryType { fun createTask(input: String, type: String): RemoteOperationResult - fun getTaskList(appId: String): RemoteOperationResult + fun getTaskList(taskType: String): RemoteOperationResult fun deleteTask(id: Long): RemoteOperationResult } diff --git a/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt b/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt index db7e2ac2eb..976d8603c9 100644 --- a/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt +++ b/app/src/main/java/com/nextcloud/client/assistant/taskTypes/TaskTypesRow.kt @@ -20,10 +20,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.dp -import com.owncloud.android.lib.resources.assistant.model.TaskType +import com.nextcloud.client.assistant.taskTypes.model.AssistantTaskType @Composable -fun TaskTypesRow(selectedTaskType: TaskType?, data: List?, selectTaskType: (TaskType) -> Unit) { +fun TaskTypesRow(selectedTaskType: AssistantTaskType?, data: List?, selectTaskType: (AssistantTaskType) -> Unit) { Row( modifier = Modifier .fillMaxWidth() diff --git a/app/src/main/java/com/nextcloud/client/assistant/taskTypes/model/AssistantTaskType.kt b/app/src/main/java/com/nextcloud/client/assistant/taskTypes/model/AssistantTaskType.kt new file mode 100644 index 0000000000..8ac2af7bc4 --- /dev/null +++ b/app/src/main/java/com/nextcloud/client/assistant/taskTypes/model/AssistantTaskType.kt @@ -0,0 +1,30 @@ +/* + * Nextcloud - Android Client + * + * SPDX-FileCopyrightText: 2024 Alper Ozturk + * SPDX-License-Identifier: AGPL-3.0-or-later + */ + +package com.nextcloud.client.assistant.taskTypes.model + +import com.owncloud.android.lib.resources.assistant.model.TaskTypes + +data class AssistantTaskType( + val id: String?, + val name: String?, + val description: String? +) + +fun TaskTypes.toAssistantTaskTypeList(): List { + return arrayListOf().apply { + add(AssistantTaskType("core:text2text", types.coreText2text.name, types.coreText2text.description)) + add(AssistantTaskType("core:text2text:topics", types.coreText2textTopics.name, types.coreText2textTopics.description)) + add(AssistantTaskType("core:text2text:headline", types.coreText2textHeadline.name, types.coreText2textHeadline.description)) + add(AssistantTaskType("core:text2text:summary", types.coreText2textSummary.name, types.coreText2textSummary.description)) + add(AssistantTaskType("core:text2text:translate", types.coreText2textTranslate.name, types.coreText2textTranslate.description)) + add(AssistantTaskType("core:text2image", types.coreText2image.name, types.coreText2image.description)) + add(AssistantTaskType("core:audio2text", types.coreAudio2text.name, types.coreAudio2text.description)) + add(AssistantTaskType("core:contextwrite", types.coreContextwrite.name, types.coreContextwrite.description)) + add(AssistantTaskType("context_chat:context_chat", types.contextChatContextChat.name, types.contextChatContextChat.description)) + } +} diff --git a/app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt b/app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt index d341769208..d310e6e37c 100644 --- a/app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt +++ b/app/src/main/java/com/nextcloud/ui/composeActivity/ComposeActivity.kt @@ -31,7 +31,6 @@ import com.owncloud.android.lib.common.utils.Log_OC import com.owncloud.android.ui.activity.DrawerActivity import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext -import java.lang.ref.WeakReference class ComposeActivity : DrawerActivity() { @@ -88,8 +87,7 @@ class ComposeActivity : DrawerActivity() { nextcloudClient?.let { client -> AssistantScreen( viewModel = AssistantViewModel( - repository = AssistantRepository(client), - context = WeakReference(this) + repository = AssistantRepository(client) ), activity = this ) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b5be74127c..7e3c5a29b8 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -46,7 +46,6 @@ منفذ البروكسي عرض أداة واحدة من لوحة القيادة بحث في %s - الكل أكتُب أيَّ نص هل أنت متأكد أنك ترغب بحذف هذه المهمة؟ حذف مهمة diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 024a3b1fe2..2609787a47 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -24,7 +24,6 @@ URL base Puertu del proxy Buscar en: %s - Too Escribi daqué Falló Planificóse diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml index 9d2a448b6f..783c6802b1 100644 --- a/app/src/main/res/values-b+en+001/strings.xml +++ b/app/src/main/res/values-b+en+001/strings.xml @@ -46,7 +46,6 @@ Proxy Port Shows one widget from dashboard Search in %s - All Type some text Are you sure you want to delete this task? Delete Task diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index f3bf9cd3d3..54250c33a4 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -36,7 +36,6 @@ Порт на прокси сървъра Показва един изпълним модул от таблото за управление Търсене в %s - Всички Неуспешно Планирано Завършен diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index 038992b03c..035c93b1fc 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -37,7 +37,6 @@ Porzh Proksi Diskouez a ra ur widget dre daolenn-vourzh Klask e %s - Pep tra Skrivañ un tamm testenn Ha sur oc\'h e fell deoc\'h dilemel an trevell-mañ ? Dilemel an trevell diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index b233effbdb..8fe134b9b8 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -45,7 +45,6 @@ Port del proxy Mostra un giny del tauler Cerca a %s - Totes Escriu una mica de text Segur que voleu suprimir aquesta tasca? Suprimeix la tasca diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 1558ecf62f..f6ca3a448d 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -46,7 +46,6 @@ Port proxy Zobrazuje jeden ovládací prvek z nástěnky Hledat v %s - Vše Zadejte nějaký text Opravdu chcete tuto úlohu smazat? Smazat úkol diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 4d9ce7958f..710f2598ee 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -36,7 +36,6 @@ Tillad videredeling Viser én widget fra dashboard Søg i %s - Alle Skriv noget tekst Er du sikker på du vil slette denne opgave? Slet opgave diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index f35eab33c8..ceffb6541b 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -46,7 +46,6 @@ Proxy-Port Zeigt ein Widget aus dem Dashboard an Suche in %s - Alle Bitte einen Text eingeben Möchten Sie diese Aufgabe wirklich löschen? Aufgabe löschen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index da9cd10d30..9e3e09020b 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -35,7 +35,6 @@ Θύρα διαμεσολαβητή Εμφάνιση ενός γραφικού στοιχείου από τον πίνακα ελέγχου Αναζήτηση στο %s - \'Ολα Πληκτρολογήστε κάποιο κείμενο Απέτυχε Ολοκληρωμένες diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 41aa8b73d2..a0655d9b8d 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -31,7 +31,6 @@ Detalaj agordoj Permesi rekunhavigon Serĉi en 1%s - Ĉiuj Plenumita Nekonata Aliro malsukcesis: %1$s diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index 39e68285ea..47318ff136 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -37,7 +37,6 @@ Puerto del Proxy Muestra un widget del panel Buscar en %s - Todos Escriba un texto ¿Está seguro que desea eliminar esta tarea? Eliminar tarea diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml index d10f842d9e..47e61d6816 100644 --- a/app/src/main/res/values-es-rCL/strings.xml +++ b/app/src/main/res/values-es-rCL/strings.xml @@ -37,7 +37,6 @@ Puerto del Proxy Muestra un widget del panel de control Buscar en %s - Todos Escribe un texto ¿Está seguro que desea eliminar esta tarea? Tarea eliminada diff --git a/app/src/main/res/values-es-rCO/strings.xml b/app/src/main/res/values-es-rCO/strings.xml index 6df403977b..e76eb967bd 100644 --- a/app/src/main/res/values-es-rCO/strings.xml +++ b/app/src/main/res/values-es-rCO/strings.xml @@ -31,7 +31,6 @@ Configuración avanzada Permitir volver a compartir Buscar en %s - Todos Completado Desconocido ¡No se encontró la cuenta asociada! diff --git a/app/src/main/res/values-es-rDO/strings.xml b/app/src/main/res/values-es-rDO/strings.xml index 852854810a..8db8c1ea8a 100644 --- a/app/src/main/res/values-es-rDO/strings.xml +++ b/app/src/main/res/values-es-rDO/strings.xml @@ -30,7 +30,6 @@ Agregar a %1$s Permitir volver a compartir Buscar en %s - Todos Completado Desconocido ¡Cuenta asociada no encontrada! diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml index 03317462ae..7cd2a4d521 100644 --- a/app/src/main/res/values-es-rEC/strings.xml +++ b/app/src/main/res/values-es-rEC/strings.xml @@ -36,7 +36,6 @@ Puerto del proxy Muestra un widget del panel de control Compartir en %s - Todos Error Programado Completado diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index 49ba3ae57f..ee2be0d136 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -37,7 +37,6 @@ Puerto del proxy Muestra un widget del panel Buscar en %s - Todos Escriba algo de texto ¿Está seguro de eliminar esta tarea? Eliminar tarea diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c4a9bc5307..89e05e5790 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -38,7 +38,6 @@ Puerto del proxy Muestra un widget del tablero Buscar en %s - Todo Escriba algo de texto ¿Está seguro de querer eliminar esta tarea? Eliminar tarea diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index ae0cdf9d98..307763c273 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -46,7 +46,6 @@ Proxy-ataka Paneleko trepeta bat erakusten du Bilatu %s(e)n - Denak Idatzi testu bat Ziur zeregin hau ezabatu nahi duzula? Ezabatu zeregina diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index d5e324ea28..11b1f451d1 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -38,7 +38,6 @@ پورت پروکسی نمایش یک ابزارک از پیشخوان جستجو در %s - همه مقداری متن را تایپ کنید Failed Scheduled diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 4c917c8e5f..a7a30c9f8d 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -36,7 +36,6 @@ Välityspalvelimen portti Näyttää yhden pienoissovelluksen konsolista Etsi kohteesta %s - Kaikki Syötä tekstiä Haluatko varmasti poistaa tämän tehtävän? Poista tehtävä diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 20021336b1..d8928562be 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -46,7 +46,6 @@ Port Proxy Affiche un widget du tableau de bord Recherche dans %s - Tout Tapez du texte Êtes-vous sûr de vouloir supprimer cette tâche ? Supprimer la tâche diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml index c2ea1c2992..0f913d68f3 100644 --- a/app/src/main/res/values-ga/strings.xml +++ b/app/src/main/res/values-ga/strings.xml @@ -46,7 +46,6 @@ Port Seachfhreastalaí Taispeáin giuirléid amháin ón deais Cuardaigh i %s - Gach Clóscríobh roinnt téacs An bhfuil tú cinnte gur mhaith leat an tasc seo a scriosadh? Scrios Tasc diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 67f1549dfb..0d98dbf37c 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -46,7 +46,6 @@ Porto do proxy Amosa un trebello do taboleiro Buscar en %s - Todo Escriba algún texto Confirma que quere eliminar esta tarefa? Eliminar tarefa diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 53f588a9f8..dab66b27c0 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -34,7 +34,6 @@ Osnovni URL Proxy port Traži u %s - Sve Završeno Nepoznata pogreška Pripadajući račun nije pronađen! diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index f95ab65b84..dce31e6544 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -40,7 +40,6 @@ Proxy portja Egy modult jelenít meg a irányítópultról Keresés itt: %s - Összes Gépeljen be szöveget Sikertelen Ütemezve diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index a67029d9b9..55097e8359 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -35,7 +35,6 @@ Izinkan pembagian ulang Menampilkan satu gawit dari dasbor Cari dalam %s - Semua Tulis beberapa teks Apakah Anda yakin ingin menghapus tugas ini? Hapus Tugas diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index e15d7d88c0..db2c3fd041 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -35,7 +35,6 @@ Gátt milliþjóns Sýnir einn viðmótshluta af stjórnborði Leita í %s - Allt Lokið Óþekkt Tengdur notandaaðgangur fannst ekki! diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 3ec6517f45..69f70ee415 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -46,7 +46,6 @@ Porta proxy Mostra un widget dal cruscotto Cerca in %s - Tutti Aggiungi del testo Sei sicuro di voler rimuovere questa attività? Elimina attività diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 4cb19df0ce..9a7768e510 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -35,7 +35,6 @@ פתחת מתווך מצג וידג׳ט אחד מלוח הבקרה חפש ב %s - הכול הושלם לא ידוע לא נמצא חשבון משויך! diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index ee616d46ed..235a4284ea 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -46,7 +46,6 @@ プロキシポート ダッシュボードから一つのウィジェットを表示 %s の中を検索 - すべて テキストを入力 本当にこのタスクを削除しますか? タスクを削除 diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index 0bf9ee5e44..b5214708f1 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -35,7 +35,6 @@ Allow resharing Shows one widget from dashboard Search in %s - All Failed Completed Unknown diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index e84e072565..2cafec7609 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -38,7 +38,6 @@ 프록시 포트 대시보드에 위젯 하나만 표시 %s에서 검색 - 모두 텍스트 입력 이 작업을 삭제하시겠습니까? 작업 삭제 diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index d1638648c0..1767c1c6c8 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -37,7 +37,6 @@ Įgaliotojo serverio prievadas Rodo vieną valdiklį iš skydelio Ieškoti %s - Visos Įrašykite kokį nors tekstą Ar tikrai norite ištrinti šią užduotį? Ištrinti užduotį diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 467e141b95..858f100224 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -33,7 +33,6 @@ Atļaut atkārtotu koplietošanu Starpniekservera ports Meklēt %s - Visi Dzēst uzdevumu Neizdevās Pabeigts diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 7c14988bff..f09707c6f9 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -34,7 +34,6 @@ Proxy порта Прикажува еден виџет од контролната табла Барај во %s - Сите Неуспешно Завршено Непознат diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 37d886a278..59c1d93b8e 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -38,7 +38,6 @@ Proxy-port Viser en widget fra dashbordet Søk i %s - Alle Skriv inn litt tekst Er du sikker på at du vil slette denne oppgaven? Slett oppgave diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 19b6a387b4..642dbf6bfe 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -46,7 +46,6 @@ Proxy poort Toont één widget van dashboard Zoeken in %s - Alle Geef wat tekst in Bent u zeker dat u deze taak wilt verwijderen? Verwijder taak diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 8c164208ef..543ddc096d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -45,7 +45,6 @@ Port proxy Pokazuje jeden widżet z pulpitu nawigacyjnego Szukaj w %s - Wszystkie Wpisz jakiś tekst Czy na pewno chcesz usunąć to zadanie? Usuń zadanie diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 69cf7f5e18..3ab79e4221 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -39,7 +39,6 @@ Porta do Proxy Mostra um widget do painel Pesquisar em %s - Tudos Digite algum texto Tem certeza de que deseja excluir esta tarefa? Excluir tarefa diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 3a666664cd..2bc8f8053d 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -34,7 +34,6 @@ Permitir repartilha Mostra um \'\'widget\'\' do painel Procurar em %s - Todos Concluída Desconhecido Conta associada não encontrada! diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 823c07aa0c..9517775ac3 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -37,7 +37,6 @@ Port proxy Arată un singur widget din panoul principal Caută in %s - Toate Tastează un text Sigur doriți să ștergeți acest task? Şterge task diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ccceed196e..ec579c1ba8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -38,7 +38,6 @@ Порт прокси Показывает один виджет с главного экрана. Искать в %s - Все Наберите какой-то текст Вы уверены, что хотите удалить эту задачу? Удалить задачу diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 4f72789c87..b270eef792 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -35,7 +35,6 @@ URL de base Port serbidore intermèdiu Chirca in %s - Totu Peruna faina a disponimentu. Seletziona sa genia de faina pro nde creare una noa. Peruna faina a disponimentu pro sa genia %s. Nde podes creare una noa dae su cugione in bassu a dereta. Cumpletadu diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index 26132f0f3e..a2daa96479 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -46,7 +46,6 @@ Brána proxy Zobrazí jeden widget z hlavného panela Hľadať v %s - Všetko Napíšte nejaký text Naozaj chcete vymazať túto úlohu? Vymazať Úlohu diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 886464bb71..2508769f87 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -38,7 +38,6 @@ Vrata posredniškega strežnika Pokaži en gradnik iz nadzorne plošče Poišči v %s - Vse Opravilo je spodletelo! Načrtovano Končano diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index ce77e5b62b..d3ea0bb766 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -29,7 +29,6 @@ Cilësime të Avancuara Lejo rindarje Kërkoni në %s - Të gjithë Të plotësuara I panjohur Llogaria e lidhur nuk u gjet! diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml index 652431135b..73ea5112a4 100644 --- a/app/src/main/res/values-sr-rSP/strings.xml +++ b/app/src/main/res/values-sr-rSP/strings.xml @@ -30,7 +30,6 @@ Dodaj u %1$s Napredna podešavanja Pretraga u %s - Sve Da li ste sigurni da želite da izbrišete ovaj zadatak? Izbriši zadatak Nije uspelo diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index e89f8d589d..1d0410059b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -46,7 +46,6 @@ Прокси порт Приказује један виџет са контролне табле Тражи у %s - Све Откуцајте неки текст Да ли сте сигурни да желите да обришете овај задатак? Обриши задатак diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 8299cc8578..fd394d3d07 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -46,7 +46,6 @@ Proxyport Visa en widget från dashboard Sök i %s - Alla Skriv någon text Är du säker på att du vill ta bort den här uppgiften? Ta bort uppgift diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml index 848d04a9de..dc25210656 100644 --- a/app/src/main/res/values-th-rTH/strings.xml +++ b/app/src/main/res/values-th-rTH/strings.xml @@ -34,7 +34,6 @@ อนุญาตให้แชร์ซ้ำ แสดงหนึ่งวิดเจ็ตจากแดชบอร์ด ค้นหาใน %s - ทั้งหมด พิมพ์ข้อความของคุณ อยู่ระหว่างการดำเนินการ เสร็จแล้ว diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 395832b90d..37485f0d17 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -38,7 +38,6 @@ Vekil sunucu bağlantı noktası Panodan bir pano bileşeni görüntüler %s içinde arama - Tümü Bir şeyler yazın Bu görevi silmek istediğinize emin misiniz? Görevi sil diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml index bb64d4b20f..dec44b5e36 100644 --- a/app/src/main/res/values-ug/strings.xml +++ b/app/src/main/res/values-ug/strings.xml @@ -38,7 +38,6 @@ ۋاكالەتچى ئېغىز باشقۇرۇش تاختىسىدىكى بىر كىچىك قورالنى كۆرسىتىدۇ % S دىن ئىزدەڭ - ھەممىسى بەزى تېكىستلەرنى كىرگۈزۈڭ بۇ ۋەزىپىنى ئۆچۈرمەكچىمۇ؟ ۋەزىپىنى ئۆچۈرۈڭ diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index f6ba502de8..27555b0e6f 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -46,7 +46,6 @@ Порт проксі-сервера Показувати один віджет з панелі віджетів Пошук у %s - Всі Вставте будь-який текст Дійсно вилучити це завдання? Вилучити завдання diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 703030f62c..bc49e11974 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -33,7 +33,6 @@ Cho phép chia sẻ lại Hiện thị lối tắt từ dashboard Tìm kiếm trong %s - Tất cả Lên kế hoạch Hoàn thành Không xác định diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 30efb9373d..625773c3b7 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -46,7 +46,6 @@ 代理端口 显示仪表盘中的一个小部件 在 %s 中搜索 - 所有 输入一些文字 您确定要删除这些任务吗? 删除任务 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index a3ccd239a3..4d78a0a6af 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -46,7 +46,6 @@ proxy代理伺服器連接埠 顯示儀表板中的一個小部件 %s內搜尋 - 全部 輸入一些文字 您確定要刪除此工作項目嗎? 刪除任務 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index c85a54adb4..12aa410724 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -46,7 +46,6 @@ proxy代理伺服器連接埠 顯示儀表板中的一個小工具 搜尋 %s - 全部 輸入一些文字 您確定要刪除此工作項目嗎? 刪除工作項目 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c3ccd3a745..41a1d29e3a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -76,8 +76,6 @@ Input Output - All - Assistant All files Personal files