From 0a2cdff945eb33f058d8231554ccbf585c574f9a Mon Sep 17 00:00:00 2001 From: Roger Yang Date: Tue, 27 Jul 2021 16:44:25 -0400 Subject: [PATCH] [fenix] Issue https://github.com/mozilla-mobile/fenix/issues/2783: Add snackbar to collection deletion --- .../java/org/mozilla/fenix/ui/SmokeTest.kt | 2 +- .../fenix/ui/robots/CollectionRobot.kt | 1 - .../fenix/components/TabCollectionStorage.kt | 10 ++++ .../org/mozilla/fenix/home/HomeFragment.kt | 54 ++++++++----------- .../SessionControlController.kt | 26 ++------- app/src/main/res/values-an/strings.xml | 2 - app/src/main/res/values-ar/strings.xml | 2 - app/src/main/res/values-ast/strings.xml | 2 - app/src/main/res/values-az/strings.xml | 2 - app/src/main/res/values-be/strings.xml | 2 - app/src/main/res/values-bg/strings.xml | 2 - app/src/main/res/values-bn/strings.xml | 2 - app/src/main/res/values-br/strings.xml | 2 - app/src/main/res/values-bs/strings.xml | 2 - app/src/main/res/values-ca/strings.xml | 2 - app/src/main/res/values-cak/strings.xml | 2 - app/src/main/res/values-ckb/strings.xml | 2 - app/src/main/res/values-co/strings.xml | 2 - app/src/main/res/values-cs/strings.xml | 2 - app/src/main/res/values-cy/strings.xml | 2 - app/src/main/res/values-da/strings.xml | 2 - app/src/main/res/values-de/strings.xml | 2 - app/src/main/res/values-dsb/strings.xml | 2 - app/src/main/res/values-el/strings.xml | 2 - app/src/main/res/values-en-rCA/strings.xml | 2 - app/src/main/res/values-en-rGB/strings.xml | 2 - app/src/main/res/values-eo/strings.xml | 2 - app/src/main/res/values-es-rAR/strings.xml | 2 - app/src/main/res/values-es-rCL/strings.xml | 2 - app/src/main/res/values-es-rES/strings.xml | 2 - app/src/main/res/values-es-rMX/strings.xml | 2 - app/src/main/res/values-es/strings.xml | 2 - app/src/main/res/values-et/strings.xml | 2 - app/src/main/res/values-eu/strings.xml | 2 - app/src/main/res/values-fa/strings.xml | 2 - app/src/main/res/values-ff/strings.xml | 2 - app/src/main/res/values-fi/strings.xml | 2 - app/src/main/res/values-fr/strings.xml | 2 - app/src/main/res/values-fy-rNL/strings.xml | 2 - app/src/main/res/values-ga-rIE/strings.xml | 2 - app/src/main/res/values-gd/strings.xml | 2 - app/src/main/res/values-gl/strings.xml | 2 - app/src/main/res/values-gn/strings.xml | 2 - app/src/main/res/values-gu-rIN/strings.xml | 2 - app/src/main/res/values-hi-rIN/strings.xml | 2 - app/src/main/res/values-hr/strings.xml | 2 - app/src/main/res/values-hsb/strings.xml | 2 - app/src/main/res/values-hu/strings.xml | 2 - app/src/main/res/values-hy-rAM/strings.xml | 2 - app/src/main/res/values-ia/strings.xml | 2 - app/src/main/res/values-in/strings.xml | 2 - app/src/main/res/values-is/strings.xml | 2 - app/src/main/res/values-it/strings.xml | 2 - app/src/main/res/values-iw/strings.xml | 2 - app/src/main/res/values-ja/strings.xml | 2 - app/src/main/res/values-ka/strings.xml | 2 - app/src/main/res/values-kab/strings.xml | 2 - app/src/main/res/values-kk/strings.xml | 2 - app/src/main/res/values-kmr/strings.xml | 2 - app/src/main/res/values-kn/strings.xml | 2 - app/src/main/res/values-ko/strings.xml | 2 - app/src/main/res/values-lij/strings.xml | 2 - app/src/main/res/values-lo/strings.xml | 2 - app/src/main/res/values-lt/strings.xml | 2 - app/src/main/res/values-ml/strings.xml | 2 - app/src/main/res/values-mr/strings.xml | 2 - app/src/main/res/values-my/strings.xml | 2 - app/src/main/res/values-nb-rNO/strings.xml | 2 - app/src/main/res/values-nl/strings.xml | 2 - app/src/main/res/values-nn-rNO/strings.xml | 2 - app/src/main/res/values-oc/strings.xml | 2 - app/src/main/res/values-pa-rIN/strings.xml | 2 - app/src/main/res/values-pl/strings.xml | 2 - app/src/main/res/values-pt-rBR/strings.xml | 2 - app/src/main/res/values-pt-rPT/strings.xml | 2 - app/src/main/res/values-rm/strings.xml | 2 - app/src/main/res/values-ro/strings.xml | 2 - app/src/main/res/values-ru/strings.xml | 2 - app/src/main/res/values-sat/strings.xml | 2 - app/src/main/res/values-sk/strings.xml | 2 - app/src/main/res/values-sl/strings.xml | 2 - app/src/main/res/values-sq/strings.xml | 2 - app/src/main/res/values-sr/strings.xml | 2 - app/src/main/res/values-su/strings.xml | 2 - app/src/main/res/values-sv-rSE/strings.xml | 2 - app/src/main/res/values-ta/strings.xml | 2 - app/src/main/res/values-te/strings.xml | 2 - app/src/main/res/values-tg/strings.xml | 2 - app/src/main/res/values-th/strings.xml | 2 - app/src/main/res/values-tl/strings.xml | 2 - app/src/main/res/values-tr/strings.xml | 2 - app/src/main/res/values-trs/strings.xml | 2 - app/src/main/res/values-tt/strings.xml | 2 - app/src/main/res/values-uk/strings.xml | 2 - app/src/main/res/values-ur/strings.xml | 2 - app/src/main/res/values-uz/strings.xml | 2 - app/src/main/res/values-vec/strings.xml | 2 - app/src/main/res/values-vi/strings.xml | 2 - app/src/main/res/values-zh-rCN/strings.xml | 2 - app/src/main/res/values-zh-rTW/strings.xml | 2 - app/src/main/res/values/strings.xml | 2 - .../DefaultSessionControlControllerTest.kt | 32 ++--------- 102 files changed, 41 insertions(+), 276 deletions(-) diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt index 989300338d..08a92353ab 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/SmokeTest.kt @@ -981,10 +981,10 @@ class SmokeTest { }.expandCollection(collectionName) { clickCollectionThreeDotButton() selectDeleteCollection() - confirmDeleteCollection() } homeScreen { + verifySnackBarText("Collection deleted") verifyNoCollectionsText() } } diff --git a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt index cfc612565c..6261c192e9 100644 --- a/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt +++ b/app/src/androidTest/java/org/mozilla/fenix/ui/robots/CollectionRobot.kt @@ -131,7 +131,6 @@ class CollectionRobot { fun selectDeleteCollection() { onView(withText("Delete collection")).click() - mDevice.waitNotNull(Until.findObject(By.res("android:id/message")), waitingTime) } fun confirmDeleteCollection() { diff --git a/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt b/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt index da337195b1..4950feb9ef 100644 --- a/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt +++ b/app/src/main/java/org/mozilla/fenix/components/TabCollectionStorage.kt @@ -13,6 +13,7 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import mozilla.components.browser.state.state.TabSessionState +import mozilla.components.browser.state.state.createTab import mozilla.components.feature.tab.collections.Tab import mozilla.components.feature.tab.collections.TabCollection import mozilla.components.feature.tab.collections.TabCollectionStorage @@ -68,6 +69,15 @@ class TabCollectionStorage( } } + suspend fun createCollection(tabCollection: TabCollection): Long? { + return withContext(ioScope.coroutineContext) { + val sessions = tabCollection.tabs.map { createTab(url = it.url, title = it.title) } + val id = collectionStorage.createCollection(tabCollection.title, sessions) + notifyObservers { onCollectionCreated(tabCollection.title, sessions, id) } + id + } + } + suspend fun addTabsToCollection(tabCollection: TabCollection, sessions: List): Long? { return withContext(ioScope.coroutineContext) { val id = collectionStorage.addTabsToCollection(tabCollection, sessions) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index 0fe0bef6d1..e2b4397079 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -6,7 +6,6 @@ package org.mozilla.fenix.home import android.animation.Animator import android.content.Context -import android.content.DialogInterface import android.content.res.Configuration import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.ColorDrawable @@ -22,7 +21,6 @@ import android.widget.Button import android.widget.LinearLayout import android.widget.PopupWindow import androidx.annotation.VisibleForTesting -import androidx.appcompat.app.AlertDialog import androidx.appcompat.content.res.AppCompatResources import androidx.constraintlayout.widget.ConstraintLayout import androidx.constraintlayout.widget.ConstraintSet @@ -301,7 +299,7 @@ class HomeFragment : Fragment() { viewLifecycleScope = viewLifecycleOwner.lifecycleScope, hideOnboarding = ::hideOnboardingAndOpenSearch, registerCollectionStorageObserver = ::registerCollectionStorageObserver, - showDeleteCollectionPrompt = ::showDeleteCollectionPrompt, + removeCollectionWithUndo = ::removeCollectionWithUndo, showTabTray = ::openTabsTray, handleSwipedItemDeletionCancel = ::handleSwipedItemDeletionCancel ), @@ -703,34 +701,25 @@ class HomeFragment : Fragment() { } } - private fun showDeleteCollectionPrompt( - tabCollection: TabCollection, - title: String?, - message: String, - wasSwiped: Boolean, - handleSwipedItemDeletionCancel: () -> Unit - ) { - val context = context ?: return - AlertDialog.Builder(context).apply { - setTitle(title) - setMessage(message) - setNegativeButton(R.string.tab_collection_dialog_negative) { dialog: DialogInterface, _ -> - if (wasSwiped) { - handleSwipedItemDeletionCancel() - } - dialog.cancel() - } - setPositiveButton(R.string.tab_collection_dialog_positive) { dialog: DialogInterface, _ -> - // Use fragment's lifecycle; the view may be gone by the time dialog is interacted with. - lifecycleScope.launch(IO) { - context.components.core.tabCollectionStorage.removeCollection(tabCollection) - context.components.analytics.metrics.track(Event.CollectionRemoved) - }.invokeOnCompletion { - dialog.dismiss() - } - } - create() - }.show() + @VisibleForTesting + internal fun removeCollectionWithUndo(tabCollection: TabCollection) { + val snackbarMessage = getString(R.string.snackbar_collection_deleted) + + lifecycleScope.allowUndo( + requireView(), + snackbarMessage, + getString(R.string.snackbar_deleted_undo), + { + requireComponents.core.tabCollectionStorage.createCollection(tabCollection) + }, + operation = { }, + elevation = TOAST_ELEVATION, + anchorView = null + ) + + lifecycleScope.launch(IO) { + requireComponents.core.tabCollectionStorage.removeCollection(tabCollection) + } } override fun onResume() { @@ -1142,5 +1131,8 @@ class HomeFragment : Fragment() { private const val FADE_ANIM_DURATION = 150L private const val CFR_WIDTH_DIVIDER = 1.7 private const val CFR_Y_OFFSET = -20 + + // Elevation for undo toasts + internal const val TOAST_ELEVATION = 80f } } diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt index 635def8265..73de575eac 100644 --- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt +++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/SessionControlController.kt @@ -197,13 +197,7 @@ class DefaultSessionControlController( private val viewLifecycleScope: CoroutineScope, private val hideOnboarding: () -> Unit, private val registerCollectionStorageObserver: () -> Unit, - private val showDeleteCollectionPrompt: ( - tabCollection: TabCollection, - title: String?, - message: String, - wasSwiped: Boolean, - handleSwipedItemDeletionCancel: () -> Unit - ) -> Unit, + private val removeCollectionWithUndo: (tabCollection: TabCollection) -> Unit, private val showTabTray: () -> Unit, private val handleSwipedItemDeletionCancel: () -> Unit ) : SessionControlController { @@ -266,19 +260,7 @@ class DefaultSessionControlController( metrics.track(Event.CollectionTabRemoved) if (collection.tabs.size == 1) { - val title = activity.resources.getString( - R.string.delete_tab_and_collection_dialog_title, - collection.title - ) - val message = - activity.resources.getString(R.string.delete_tab_and_collection_dialog_message) - showDeleteCollectionPrompt( - collection, - title, - message, - wasSwiped, - handleSwipedItemDeletionCancel - ) + removeCollectionWithUndo(collection) } else { viewLifecycleScope.launch { tabCollectionStorage.removeTabFromCollection(collection, tab) @@ -296,9 +278,7 @@ class DefaultSessionControlController( } override fun handleDeleteCollectionTapped(collection: TabCollection) { - val message = - activity.resources.getString(R.string.tab_collection_dialog_message, collection.title) - showDeleteCollectionPrompt(collection, null, message, false, handleSwipedItemDeletionCancel) + removeCollectionWithUndo(collection) } override fun handleOpenInPrivateTabClicked(topSite: TopSite) { diff --git a/app/src/main/res/values-an/strings.xml b/app/src/main/res/values-an/strings.xml index a8ccecc846..c5379b4662 100644 --- a/app/src/main/res/values-an/strings.xml +++ b/app/src/main/res/values-an/strings.xml @@ -938,8 +938,6 @@ Borrar %1$s? Borrar - - Cancelar Accedendo a pantalla completa diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 76e83b1a16..65df06cde9 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1094,8 +1094,6 @@ أنحذف %1$s؟ احذف - - ألغِ تدخل وضع ملء الشاشة diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 96ae1e72d5..0da9e222a2 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -1043,8 +1043,6 @@ ¿Desaniciar %1$s? Desaniciar - - Encaboxar Tas nel mou a pantalla completa diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml index c93fa1a724..66eb83f070 100644 --- a/app/src/main/res/values-az/strings.xml +++ b/app/src/main/res/values-az/strings.xml @@ -660,8 +660,6 @@ RƏDD ET Sil - - Ləğv et Tam ekran rejiminə daxil olunur diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index c6fb1824fa..c739a89fd4 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -1116,8 +1116,6 @@ Выдаліць %1$s? Выдаліць - - Адмена Уваход у поўнаэкранны рэжым diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index c75fff8ba7..13eade29e2 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1116,8 +1116,6 @@ Изтриване на %1$s? Изтриване - - Отказ Режим на цял екран diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml index 3a39a5928c..28a4819253 100644 --- a/app/src/main/res/values-bn/strings.xml +++ b/app/src/main/res/values-bn/strings.xml @@ -897,8 +897,6 @@ %1$s মুছে ফেলবেন? মুছে ফেলুন - - বাতিল ফুল স্ক্রিন মোডে প্রবেশ করছে diff --git a/app/src/main/res/values-br/strings.xml b/app/src/main/res/values-br/strings.xml index 4bf40363a0..045f01e942 100644 --- a/app/src/main/res/values-br/strings.xml +++ b/app/src/main/res/values-br/strings.xml @@ -1097,8 +1097,6 @@ Dilemel %1$s? Dilemel - - Nullañ Mod skramm a-bezh kroget diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml index c6b0d01a16..d0f7af57b5 100644 --- a/app/src/main/res/values-bs/strings.xml +++ b/app/src/main/res/values-bs/strings.xml @@ -921,8 +921,6 @@ Obrisati %1$s? Obriši - - Otkaži Ulazim u režim cijelog ekrana diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 97fa92b863..f38eced8d4 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -1107,8 +1107,6 @@ Voleu suprimir %1$s? Suprimeix - - Cancel·la Esteu en mode de pantalla completa diff --git a/app/src/main/res/values-cak/strings.xml b/app/src/main/res/values-cak/strings.xml index ee7a370440..c571ce6566 100644 --- a/app/src/main/res/values-cak/strings.xml +++ b/app/src/main/res/values-cak/strings.xml @@ -1108,8 +1108,6 @@ ¿La niyuj %1$s? Tiyuj - - Tiq\'at Nok pa chijun ruwa diff --git a/app/src/main/res/values-ckb/strings.xml b/app/src/main/res/values-ckb/strings.xml index e6804d187f..94e6e9ceb2 100644 --- a/app/src/main/res/values-ckb/strings.xml +++ b/app/src/main/res/values-ckb/strings.xml @@ -1055,8 +1055,6 @@ %1$s دەسڕیتەوە؟ سڕینەوە - - پاشگەزبوونەوە چوونە دۆخی پراوپڕی شاشە diff --git a/app/src/main/res/values-co/strings.xml b/app/src/main/res/values-co/strings.xml index 9c08170d5b..2d533afde4 100644 --- a/app/src/main/res/values-co/strings.xml +++ b/app/src/main/res/values-co/strings.xml @@ -1114,8 +1114,6 @@ Squassà %1$s ? Squassà - - Abbandunà Modu di screnu sanu attivatu diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 7b99b727f3..6dbe9495a0 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -1125,8 +1125,6 @@ Odstranit - - Zrušit Spuštěn režim celé obrazovky diff --git a/app/src/main/res/values-cy/strings.xml b/app/src/main/res/values-cy/strings.xml index 77fb0d92b8..3947e4483b 100644 --- a/app/src/main/res/values-cy/strings.xml +++ b/app/src/main/res/values-cy/strings.xml @@ -1104,8 +1104,6 @@ Dileu %1$s? Dileu - - Diddymu Mynd i’r sgrin lawn diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index bc69a6d240..7503c2ee02 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1095,8 +1095,6 @@ Slet %1$s? Slet - - Fortryd Fuldskærmstilstand aktiveret diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index ac6f23e0fc..b678c18c4e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1136,8 +1136,6 @@ %1$s löschen? Löschen - - Abbrechen Vollbildmodus wird gestartet diff --git a/app/src/main/res/values-dsb/strings.xml b/app/src/main/res/values-dsb/strings.xml index 8050a13c6c..22ffa4bde3 100644 --- a/app/src/main/res/values-dsb/strings.xml +++ b/app/src/main/res/values-dsb/strings.xml @@ -1125,8 +1125,6 @@ %1$s lašowaś? Lašowaś - - Pśetergnuś Połna wobrazowka se pokazujo diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 61c69ac750..c4055cff1d 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -1116,8 +1116,6 @@ Διαγραφή του %1$s; Διαγραφή - - Ακύρωση Είσοδος σε λειτουργία πλήρους οθόνης diff --git a/app/src/main/res/values-en-rCA/strings.xml b/app/src/main/res/values-en-rCA/strings.xml index 4fb78dd41b..6af092c138 100644 --- a/app/src/main/res/values-en-rCA/strings.xml +++ b/app/src/main/res/values-en-rCA/strings.xml @@ -1096,8 +1096,6 @@ Delete %1$s? Delete - - Cancel Entering full screen mode diff --git a/app/src/main/res/values-en-rGB/strings.xml b/app/src/main/res/values-en-rGB/strings.xml index eb15126af3..dfafd908f7 100644 --- a/app/src/main/res/values-en-rGB/strings.xml +++ b/app/src/main/res/values-en-rGB/strings.xml @@ -1099,8 +1099,6 @@ Delete %1$s? Delete - - Cancel Entering full screen mode diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 8c9828e2fe..015bf41f18 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -1100,8 +1100,6 @@ Ĉu forigi %1$s? Forigi - - Nuligi Plenekrana reĝimo aktiva diff --git a/app/src/main/res/values-es-rAR/strings.xml b/app/src/main/res/values-es-rAR/strings.xml index 3d0caf6e9d..1f3bb58f1e 100644 --- a/app/src/main/res/values-es-rAR/strings.xml +++ b/app/src/main/res/values-es-rAR/strings.xml @@ -1125,8 +1125,6 @@ ¿Eliminar %1$s? Eliminar - - Cancelar Acceder a pantalla completa diff --git a/app/src/main/res/values-es-rCL/strings.xml b/app/src/main/res/values-es-rCL/strings.xml index 994669feb6..511307a777 100644 --- a/app/src/main/res/values-es-rCL/strings.xml +++ b/app/src/main/res/values-es-rCL/strings.xml @@ -1123,8 +1123,6 @@ ¿Eliminar %1$s? Eliminar - - Cancelar Pasando a modo de pantalla completa diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index e20dd44b06..5e6db153a8 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -1134,8 +1134,6 @@ ¿Eliminar %1$s? Eliminar - - Cancelar Accediendo a pantalla completa diff --git a/app/src/main/res/values-es-rMX/strings.xml b/app/src/main/res/values-es-rMX/strings.xml index a930b40bc9..5283cb86ea 100644 --- a/app/src/main/res/values-es-rMX/strings.xml +++ b/app/src/main/res/values-es-rMX/strings.xml @@ -1099,8 +1099,6 @@ ¿Eliminar %1$s? Eliminar - - Cancelar Accediendo a pantalla completa diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6dacbf46b1..b34b07bcc9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1135,8 +1135,6 @@ ¿Eliminar %1$s? Eliminar - - Cancelar Accediendo al modo de pantalla completa diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 4f6f4acff4..b5319d8758 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -766,8 +766,6 @@ Kas oled kindel, et soovid kustutada kollektsiooni %1$s? Kustuta - - Loobu Täisekraanirežiimi sisenemine diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 12fa844ebf..b7f7a7f3bc 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -1117,8 +1117,6 @@ %1$s ezabatu? Ezabatu - - Utzi Pantaila osoko moduan sartzen diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index 7a3e4540a6..9aaab4a5ed 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -1065,8 +1065,6 @@ %1$s حذف شود؟ حذف - - انصراف ورود به حالت تمام صفحه diff --git a/app/src/main/res/values-ff/strings.xml b/app/src/main/res/values-ff/strings.xml index 9c521dd6ef..a984980b61 100644 --- a/app/src/main/res/values-ff/strings.xml +++ b/app/src/main/res/values-ff/strings.xml @@ -710,8 +710,6 @@ Aɗa yenanaa yiɗde momtude %1$s? Momtu - - Haaytu Ñiiɓirde geese nattaama diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 8b4d2ba5e8..ce13b48911 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1116,8 +1116,6 @@ Poistetaanko %1$s? Poista - - Peruuta Siirrytään koko näytön tilaan diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index b0f9138076..7a1f3434c9 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -1133,8 +1133,6 @@ Supprimer %1$s ? Supprimer - - Annuler Mode plein écran activé diff --git a/app/src/main/res/values-fy-rNL/strings.xml b/app/src/main/res/values-fy-rNL/strings.xml index 61bca3ec67..3f670edeba 100644 --- a/app/src/main/res/values-fy-rNL/strings.xml +++ b/app/src/main/res/values-fy-rNL/strings.xml @@ -1104,8 +1104,6 @@ %1$s fuortsmite? Fuortsmite - - Annulearje Folslein skerm wurdt iepene diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml index 2935a12daf..2348d70994 100644 --- a/app/src/main/res/values-ga-rIE/strings.xml +++ b/app/src/main/res/values-ga-rIE/strings.xml @@ -747,8 +747,6 @@ An bhfuil tú cinnte gur mhaith leat %1$s a scriosadh? Scrios - - Cealaigh Ag dul isteach sa mód lánscáileáin diff --git a/app/src/main/res/values-gd/strings.xml b/app/src/main/res/values-gd/strings.xml index 62ee0a60b0..fc93fe97e5 100644 --- a/app/src/main/res/values-gd/strings.xml +++ b/app/src/main/res/values-gd/strings.xml @@ -1095,8 +1095,6 @@ A bheil thu airson %1$s a sguabadh às? Sguab às - - Sguir dheth A’ fosgladh modh na làn-sgrìn diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index a1fb66b337..38fb7d17f1 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -1048,8 +1048,6 @@ Eliminar - - Cancelar Entrado no modo de pantalla completa diff --git a/app/src/main/res/values-gn/strings.xml b/app/src/main/res/values-gn/strings.xml index 7f00fe3335..56ad35b572 100644 --- a/app/src/main/res/values-gn/strings.xml +++ b/app/src/main/res/values-gn/strings.xml @@ -1124,8 +1124,6 @@ ¿Emboguete %1$s? Mboguete - - Heja Oikehína mba’erechaha tuichavévape diff --git a/app/src/main/res/values-gu-rIN/strings.xml b/app/src/main/res/values-gu-rIN/strings.xml index 4f512c8d67..63f18655ca 100644 --- a/app/src/main/res/values-gu-rIN/strings.xml +++ b/app/src/main/res/values-gu-rIN/strings.xml @@ -760,8 +760,6 @@ %1$s ને કાઢી નાખીએ? કાઢી નાખો - - રદ કરો પૂર્ણ સ્ક્રીન મોડમાં દાખલ થઈ રહ્યું છે diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml index b2966adbe1..726e4ddf43 100644 --- a/app/src/main/res/values-hi-rIN/strings.xml +++ b/app/src/main/res/values-hi-rIN/strings.xml @@ -965,8 +965,6 @@ %1$s को मिटाएं? मिटाएं - - रद्द करें पूर्ण स्क्रीन मोड में प्रवेश diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 181f6240ff..4ff1cf781c 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -1111,8 +1111,6 @@ Obriši %1$s? Izbriši - - Odustani Pokretanje cjeloekranskog prikaza diff --git a/app/src/main/res/values-hsb/strings.xml b/app/src/main/res/values-hsb/strings.xml index 2cb5f4b001..2e9b990fa2 100644 --- a/app/src/main/res/values-hsb/strings.xml +++ b/app/src/main/res/values-hsb/strings.xml @@ -1130,8 +1130,6 @@ %1$s zhašeć? Zhašeć - - Přetorhnyć Połna wobrazowka so pokazuje diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 5e224ad4fb..5ebfa9d2d7 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1111,8 +1111,6 @@ Törli ezt: %1$s? Törlés - - Mégse Belépés teljes képernyős módba diff --git a/app/src/main/res/values-hy-rAM/strings.xml b/app/src/main/res/values-hy-rAM/strings.xml index 369d8ef8ef..d68384c90e 100644 --- a/app/src/main/res/values-hy-rAM/strings.xml +++ b/app/src/main/res/values-hy-rAM/strings.xml @@ -1105,8 +1105,6 @@ Ջնջե՞լ %1$s-ը: Ջնջել - - Չեղարկել Մուտք լիաէկրան diff --git a/app/src/main/res/values-ia/strings.xml b/app/src/main/res/values-ia/strings.xml index 29bb142ab7..ecf61c4771 100644 --- a/app/src/main/res/values-ia/strings.xml +++ b/app/src/main/res/values-ia/strings.xml @@ -1162,8 +1162,6 @@ Deler %1$s? Deler - - Cancellar Entrante in modo plen schermo diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml index c71f84ad9f..65f1e24210 100644 --- a/app/src/main/res/values-in/strings.xml +++ b/app/src/main/res/values-in/strings.xml @@ -1121,8 +1121,6 @@ Hapus %1$s? Hapus - - Batal Memasuki mode layar penuh diff --git a/app/src/main/res/values-is/strings.xml b/app/src/main/res/values-is/strings.xml index 9a715a1e56..34b160cf0a 100644 --- a/app/src/main/res/values-is/strings.xml +++ b/app/src/main/res/values-is/strings.xml @@ -833,8 +833,6 @@ Ertu viss um að þú viljir eyða %1$s? Eyða - - Hætta við Fara í fullan skjá diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 39864d8d86..3f2ce059a2 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -1137,8 +1137,6 @@ Eliminare %1$s? Elimina - - Annulla Passa a schermo intero diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml index 14dd4acdde..a573dc8bee 100644 --- a/app/src/main/res/values-iw/strings.xml +++ b/app/src/main/res/values-iw/strings.xml @@ -1105,8 +1105,6 @@ למחוק את %1$s? מחיקה - - ביטול עברת למצב מסך מלא diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 663930c3be..74c44a915a 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -1122,8 +1122,6 @@ %1$s のコレクションを削除しますか？ 削除 - - キャンセル 全画面表示モードです diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml index fd8002ec33..75aed0cc6a 100644 --- a/app/src/main/res/values-ka/strings.xml +++ b/app/src/main/res/values-ka/strings.xml @@ -1103,8 +1103,6 @@ წაიშალოს %1$s? წაშლა - - გაუქმება სრულ ეკრანზე გაშლა diff --git a/app/src/main/res/values-kab/strings.xml b/app/src/main/res/values-kab/strings.xml index 2a0f9e19c2..21320d685e 100644 --- a/app/src/main/res/values-kab/strings.xml +++ b/app/src/main/res/values-kab/strings.xml @@ -1118,8 +1118,6 @@ Tiktiwin tigejdanin yuzzlen ur nṣeḥḥi ara Kkes %1$s? Kkes - - Sefsex Askar n ugdil ačaran yermed diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml index 4d0adc8dd3..ecaecf0d6d 100644 --- a/app/src/main/res/values-kk/strings.xml +++ b/app/src/main/res/values-kk/strings.xml @@ -1095,8 +1095,6 @@ %1$s өшіру керек пе? Өшіру - - Бас тарту Толық экран режиміне өту diff --git a/app/src/main/res/values-kmr/strings.xml b/app/src/main/res/values-kmr/strings.xml index 57238d9393..60cf66a3d0 100644 --- a/app/src/main/res/values-kmr/strings.xml +++ b/app/src/main/res/values-kmr/strings.xml @@ -1068,8 +1068,6 @@ %1$s’ê jê bibe? Jê bibe - - Betal bike Têketina moda ekrana dagirtî diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml index f325017630..42664fdeec 100644 --- a/app/src/main/res/values-kn/strings.xml +++ b/app/src/main/res/values-kn/strings.xml @@ -819,8 +819,6 @@ ‍%1$s ಅನ್ನು ಅಳಿಸುವುದೇ? ಅಳಿಸು - - ರದ್ದು ಮಾಡು ಪೂರ್ಣ ಪರದೆ ಮೋಡ್‌ಗೆ ಪ್ರವೇಶಿಸಲಾಗುತ್ತಿದೆ diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 14df47e5bb..fcfbc8be4b 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -1167,8 +1167,6 @@ %1$s 모음집을 삭제하시겠습니까? 삭제 - - 취소 전체 화면 모드로 전환 중 diff --git a/app/src/main/res/values-lij/strings.xml b/app/src/main/res/values-lij/strings.xml index 500552d81c..a3916d2c31 100644 --- a/app/src/main/res/values-lij/strings.xml +++ b/app/src/main/res/values-lij/strings.xml @@ -825,8 +825,6 @@ T\'ê seguo de voei scancelâ %1$s? Scancella - - Anulla Intra into mòddo a tutto schermo diff --git a/app/src/main/res/values-lo/strings.xml b/app/src/main/res/values-lo/strings.xml index 177b69256b..7c0fad7186 100644 --- a/app/src/main/res/values-lo/strings.xml +++ b/app/src/main/res/values-lo/strings.xml @@ -1097,8 +1097,6 @@ ລຶບ %1$s? ລຶບ - - ຍົກເລີກ ເຂົ້າສູ່ໂມດເຕັມຫນ້າຈໍ diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index f182a73106..f251dc643f 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -1108,8 +1108,6 @@ Pašalinti „%1$s“? Pašalinti - - Atsisakyti Įjungta viso ekrano veiksena diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 8e453ec5be..fa87bf5af8 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -830,8 +830,6 @@ %1$s നീക്കം ചെയ്യണമെന്ന് താങ്കൾക്ക് ഉറപ്പാണോ? നീക്കം ചെയ്യുക - - റദ്ദാക്കുക സ്ക്രീൻ പൂര്‍ണ്ണവലിപ്പത്തിലാക്കുന്നു diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml index b8f5e4c149..f70380bfab 100644 --- a/app/src/main/res/values-mr/strings.xml +++ b/app/src/main/res/values-mr/strings.xml @@ -836,8 +836,6 @@ आपल्याला खात्री आहे की आपण %1$s हटवू इच्छिता? हटवा - - रद्द करा पूर्ण स्क्रीन मोडमध्ये प्रवेश करत आहे diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml index bfebd33a65..fc2df66365 100644 --- a/app/src/main/res/values-my/strings.xml +++ b/app/src/main/res/values-my/strings.xml @@ -846,8 +846,6 @@ %1$s ကိုဖျက်မှာလား? ဖျက်ပါ - - မလုပ်ဆောင်တော့ပါ ဖန်သားပြင်အပြည့်ဖြင့်ကြည့်ခြင်း diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 23844285c1..2313fb5ae0 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -1113,8 +1113,6 @@ Vil du slette %1$s? Slett - - Avbryt Starter fullskjermmodus diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 36f3bd05e3..52c611d08a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -1114,8 +1114,6 @@ %1$s verwijderen? Verwijderen - - Annuleren Volledig scherm wordt geopend diff --git a/app/src/main/res/values-nn-rNO/strings.xml b/app/src/main/res/values-nn-rNO/strings.xml index 9445857bee..63fffab118 100644 --- a/app/src/main/res/values-nn-rNO/strings.xml +++ b/app/src/main/res/values-nn-rNO/strings.xml @@ -1117,8 +1117,6 @@ Vil du slette %1$s? Slett - - Avbryt Startar fullskjermmodus diff --git a/app/src/main/res/values-oc/strings.xml b/app/src/main/res/values-oc/strings.xml index 292645dfa0..a7845acc62 100644 --- a/app/src/main/res/values-oc/strings.xml +++ b/app/src/main/res/values-oc/strings.xml @@ -1116,8 +1116,6 @@ Suprimir %1$s ? Suprimir - - Anullar Mòde plen ecran actiu diff --git a/app/src/main/res/values-pa-rIN/strings.xml b/app/src/main/res/values-pa-rIN/strings.xml index 717a58703e..bffad7deea 100644 --- a/app/src/main/res/values-pa-rIN/strings.xml +++ b/app/src/main/res/values-pa-rIN/strings.xml @@ -1122,8 +1122,6 @@ %1$s ਨੂੰ ਹਟਾਉਣਾ ਹੈ? ਹਟਾਓ - - ਰੱਦ ਕਰੋ ਪੂਰੀ ਸਕਰੀਨ ਢੰਗ ਵਿੱਚ ਜਾ ਰਿਹਾ ਹੈ diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 778f6ab37e..9ce7f0c6b6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -1111,8 +1111,6 @@ Czy usunąć „%1$s”? Usuń - - Anuluj Włączono tryb pełnoekranowy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 559c0a4155..a6bd868c21 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1104,8 +1104,6 @@ Excluir %1$s? Excluir - - Cancelar Entrando no modo de tela inteira diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 543cf31a26..d39d1d9aa6 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -1107,8 +1107,6 @@ Eliminar %1$s? Eliminar - - Cancelar A entrar no modo de ecrã completo diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml index 62120e20f7..c4aae344d3 100644 --- a/app/src/main/res/values-rm/strings.xml +++ b/app/src/main/res/values-rm/strings.xml @@ -1099,8 +1099,6 @@ Stizzar %1$s? Stizzar - - Interrumper Midar al modus da maletg entir diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 95ada77884..b4ddfe4866 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -874,8 +874,6 @@ Ștergi %1$s? Șterge - - Renunță Se intră în modul ecran complet diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 242cf605b7..1990a8dbd8 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -1136,8 +1136,6 @@ Удалить %1$s? Удалить - - Отмена Вход в полноэкранный режим diff --git a/app/src/main/res/values-sat/strings.xml b/app/src/main/res/values-sat/strings.xml index c01d8d2102..9f8809fbbe 100644 --- a/app/src/main/res/values-sat/strings.xml +++ b/app/src/main/res/values-sat/strings.xml @@ -1107,8 +1107,6 @@ %1$s ᱢᱮᱴᱟᱣᱟ ᱥᱮ? ᱢᱮᱴᱟᱣ ᱢᱮ - - ᱵᱟᱹᱰᱨᱟᱹ ᱯᱩᱨᱟᱹ ᱠᱨᱤᱱ ᱢᱳᱰ ᱵᱚᱞᱚᱱ ᱠᱟᱱᱟᱢ diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 3a67c4b30a..d607a7b142 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -1115,8 +1115,6 @@ Odstrániť %1$s? Odstrániť - - Zrušiť Bol spustený režim celej obrazovky diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index eb3bf3e84e..d175de23f2 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -1108,8 +1108,6 @@ Izbrišem %1$s? Izbriši - - Prekliči Vstop v celozaslonski način diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml index dd9e289e46..9d28a3009e 100644 --- a/app/src/main/res/values-sq/strings.xml +++ b/app/src/main/res/values-sq/strings.xml @@ -1102,8 +1102,6 @@ Të fshihet %1$s? Fshije - - Anuloje Po hyhet në mënyrën “Sa krejt ekrani” diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index cf58717b85..042dad3c9b 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -1095,8 +1095,6 @@ Обрисати %1$s? Обриши - - Откажи Улазим у режим целог екрана diff --git a/app/src/main/res/values-su/strings.xml b/app/src/main/res/values-su/strings.xml index cf0de4ab45..7ef624b7c0 100644 --- a/app/src/main/res/values-su/strings.xml +++ b/app/src/main/res/values-su/strings.xml @@ -1110,8 +1110,6 @@ Pupus %1$s? Pupus - - Bolay Asup ka mode layar pinuh diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index 1a9f7d7c1d..1ff33343c1 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -1140,8 +1140,6 @@ Tog bort %1$s? Ta bort - - Avbryt Startar fullskärmsläge diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 93593625de..cd63f58eaa 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -938,8 +938,6 @@ %1$s அழிக்கவா? அழி - - ரத்து முழு திரை பயன்முறையில் நுழைகிறது diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index 5e86f2b58f..ba68b8ba3c 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -1056,8 +1056,6 @@ %1$s‌ని తొలగించాలా? తొలగించు - - రద్దుచేయి నిండు తెర రీతిలోకి వెళ్తున్నారు diff --git a/app/src/main/res/values-tg/strings.xml b/app/src/main/res/values-tg/strings.xml index 05b056e3a5..03a3edda12 100644 --- a/app/src/main/res/values-tg/strings.xml +++ b/app/src/main/res/values-tg/strings.xml @@ -1104,8 +1104,6 @@ %1$s-ро нест мекунед? Нест кардан - - Бекор кардан Ба реҷаи экрани пурра ворид шуда истодааст diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml index 658dd3c535..cf8ea780b7 100644 --- a/app/src/main/res/values-th/strings.xml +++ b/app/src/main/res/values-th/strings.xml @@ -1102,8 +1102,6 @@ ลบ %1$s หรือไม่? ลบ - - ยกเลิก เข้าสู่โหมดเต็มหน้าจอ diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml index 0775d2355e..8cdeb9fa02 100644 --- a/app/src/main/res/values-tl/strings.xml +++ b/app/src/main/res/values-tl/strings.xml @@ -1117,8 +1117,6 @@ Burahin ang %1$s? Burahin - - Kanselahin Pumapasok sa full screen mode diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index e3042da325..3dd8b35101 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1105,8 +1105,6 @@ %1$s silinsin mi? Sil - - İptal Tam ekran moduna geçiliyor diff --git a/app/src/main/res/values-trs/strings.xml b/app/src/main/res/values-trs/strings.xml index 47b6033b29..7d20cb60f5 100644 --- a/app/src/main/res/values-trs/strings.xml +++ b/app/src/main/res/values-trs/strings.xml @@ -855,8 +855,6 @@ Nādurê\'t %1$s raj Nādūre\' - - Dūyichin\' Hiàj nanunj da\' huā ngè riña aga\'a diff --git a/app/src/main/res/values-tt/strings.xml b/app/src/main/res/values-tt/strings.xml index 8e12e1fac7..23f1a0e8bb 100644 --- a/app/src/main/res/values-tt/strings.xml +++ b/app/src/main/res/values-tt/strings.xml @@ -1060,8 +1060,6 @@ %1$s җыентыгын бетерергәме? Бетерү - - Баш тарту Тулы экран режимына күчү diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 8c60059c5e..c0d4524225 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -1136,8 +1136,6 @@ Видалити %1$s? Видалити - - Скасувати Вхід у повноекранний режим diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index 78e95e3328..8083b91b2d 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -1085,8 +1085,6 @@ %1$s حذف کریں؟ مٹائیں - - منسوخ کریں فل سکرین موڈ میں داخل ہو رہا ہے diff --git a/app/src/main/res/values-uz/strings.xml b/app/src/main/res/values-uz/strings.xml index ddc06b1a9d..dbe94724d4 100644 --- a/app/src/main/res/values-uz/strings.xml +++ b/app/src/main/res/values-uz/strings.xml @@ -746,8 +746,6 @@ Varaqlar yopildi - - Bekor qilish Toʻliq ekran rejimiga oʻtmoqda diff --git a/app/src/main/res/values-vec/strings.xml b/app/src/main/res/values-vec/strings.xml index 0f2cfc2cd8..be3162d366 100644 --- a/app/src/main/res/values-vec/strings.xml +++ b/app/src/main/res/values-vec/strings.xml @@ -733,8 +733,6 @@ Scanseƚare %1$s? Scanseƚa - - Anuƚa Pasa a schermo intiero diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 9211c520ac..5b548cf7ba 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -1100,8 +1100,6 @@ Xóa %1$s? Xóa - - Hủy bỏ Đã vào chế độ toàn màn hình diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index a354726098..749aa4d17c 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -1156,8 +1156,6 @@ 要删除“%1$s”吗？ 删除 - - 取消 进入全屏模式 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 045770bdc5..e8d43a045f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -1132,8 +1132,6 @@ 要刪除 %1$s 嗎？ 刪除 - - 取消 進入全螢幕模式 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ff21085182..80a4ba6205 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1102,8 +1102,6 @@ Delete %1$s? Delete - - Cancel Entering full screen mode diff --git a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt index ab1a051d4f..582dbfbde7 100644 --- a/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt +++ b/app/src/test/java/org/mozilla/fenix/home/DefaultSessionControlControllerTest.kt @@ -263,25 +263,16 @@ class DefaultSessionControlControllerTest { } returns "Deleting this tab will delete everything." var actualCollection: TabCollection? = null - var actualTitle: String? = null - var actualMessage: String? = null - var actualWasSwipe: Boolean? = null createController( - showDeleteCollectionPrompt = { collection, title, message, wasSwipe, _ -> + removeCollectionWithUndo = { collection -> actualCollection = collection - actualTitle = title - actualMessage = message - actualWasSwipe = wasSwipe } ).handleCollectionRemoveTab(expectedCollection, tab, false) verify { metrics.track(Event.CollectionTabRemoved) } assertEquals(expectedCollection, actualCollection) - assertEquals("Delete Collection?", actualTitle) - assertEquals("Deleting this tab will delete everything.", actualMessage) - assertEquals(false, actualWasSwipe) } @Test @@ -319,23 +310,14 @@ class DefaultSessionControlControllerTest { } returns "Are you sure you want to delete Collection?" var actualCollection: TabCollection? = null - var actualTitle: String? = null - var actualMessage: String? = null - var actualWasSwipe: Boolean? = null createController( - showDeleteCollectionPrompt = { collection, title, message, wasSwipe, _ -> + removeCollectionWithUndo = { collection -> actualCollection = collection - actualTitle = title - actualMessage = message - actualWasSwipe = wasSwipe } ).handleDeleteCollectionTapped(expectedCollection) assertEquals(expectedCollection, actualCollection) - assertEquals(null, actualTitle) - assertEquals("Are you sure you want to delete Collection?", actualMessage) - assertEquals(false, actualWasSwipe) } @Test @@ -744,13 +726,7 @@ class DefaultSessionControlControllerTest { registerCollectionStorageObserver: () -> Unit = { }, showTabTray: () -> Unit = { }, handleSwipedItemDeletionCancel: () -> Unit = { }, - showDeleteCollectionPrompt: ( - tabCollection: TabCollection, - title: String?, - message: String, - wasSwiped: Boolean, - handleSwipedItemDeletionCancel: () -> Unit - ) -> Unit = { _, _, _, _, _ -> } + removeCollectionWithUndo: (tabCollection: TabCollection) -> Unit = { } ): DefaultSessionControlController { return DefaultSessionControlController( activity = activity, @@ -768,7 +744,7 @@ class DefaultSessionControlControllerTest { viewLifecycleScope = scope, hideOnboarding = hideOnboarding, registerCollectionStorageObserver = registerCollectionStorageObserver, - showDeleteCollectionPrompt = showDeleteCollectionPrompt, + removeCollectionWithUndo = removeCollectionWithUndo, showTabTray = showTabTray, handleSwipedItemDeletionCancel = handleSwipedItemDeletionCancel )