From 4734cf82f023d8aec180aa5306acc941b1e2c38e Mon Sep 17 00:00:00 2001 From: ANOOP Date: Thu, 1 Oct 2020 17:32:42 +0530 Subject: [PATCH 1/6] added snackbar --- .../app/bookmarks/ui/BookmarksActivity.kt | 22 +++++++++---------- .../app/bookmarks/ui/BookmarksViewModel.kt | 6 +++++ .../ui/FireproofWebsitesActivity.kt | 22 +++++++++++-------- .../ui/FireproofWebsitesViewModel.kt | 6 +++++ .../main/res/layout/activity_bookmarks.xml | 1 + .../layout/activity_fireproof_websites.xml | 1 + app/src/main/res/values/strings.xml | 4 ++-- 7 files changed, 40 insertions(+), 22 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt index aadd0addcba4..d7d0dedd74e2 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt @@ -43,6 +43,8 @@ import com.duckduckgo.app.global.baseHost import com.duckduckgo.app.global.view.gone import com.duckduckgo.app.global.view.html import com.duckduckgo.app.global.view.show +import com.google.android.material.snackbar.Snackbar +import kotlinx.android.synthetic.main.activity_bookmarks.* import kotlinx.android.synthetic.main.content_bookmarks.emptyBookmarks import kotlinx.android.synthetic.main.content_bookmarks.recycler import kotlinx.android.synthetic.main.include_toolbar.toolbar @@ -133,17 +135,15 @@ class BookmarksActivity : DuckDuckGoActivity() { private fun confirmDeleteBookmark(bookmark: BookmarkEntity) { val message = getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title).html(this) - val title = getString(R.string.dialogConfirmTitle) - deleteDialog = AlertDialog.Builder(this) - .setTitle(title) - .setMessage(message) - .setPositiveButton(android.R.string.yes) { _, _ -> - delete(bookmark) - } - .setNegativeButton(android.R.string.no) { dialog, _ -> - dialog.dismiss() - } - .show() + viewModel.delete(bookmark) + Snackbar.make( + bookmarkRootView, + message, + Snackbar.LENGTH_LONG + ).setAction(R.string.fireproofWebsiteSnackbarAction){ + viewModel.insert(bookmark) + }.show() + } private fun delete(bookmark: BookmarkEntity) { diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt index 6809afd15c90..be77f7abc937 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt @@ -31,6 +31,7 @@ import com.duckduckgo.app.global.SingleLiveEvent import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext class BookmarksViewModel( val dao: BookmarksDao, @@ -104,5 +105,10 @@ class BookmarksViewModel( dao.delete(bookmark) } } + fun insert(bookmark: BookmarkEntity){ + viewModelScope.launch(dispatcherProvider.io()) { + dao.insert(BookmarkEntity(title = bookmark.title, url = bookmark.url)) + } + } } diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt index d0ad1977fc80..29bff8004e1a 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt @@ -20,12 +20,16 @@ import android.app.AlertDialog import android.content.Context import android.content.Intent import android.os.Bundle +import androidx.core.text.HtmlCompat import androidx.lifecycle.Observer import com.duckduckgo.app.browser.R import com.duckduckgo.app.browser.favicon.FaviconManager import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteEntity +import com.duckduckgo.app.fire.fireproofwebsite.data.website import com.duckduckgo.app.global.DuckDuckGoActivity import com.duckduckgo.app.global.view.html +import com.google.android.material.snackbar.Snackbar +import kotlinx.android.synthetic.main.activity_fireproof_websites.* import kotlinx.android.synthetic.main.content_fireproof_websites.* import kotlinx.android.synthetic.main.include_toolbar.* import javax.inject.Inject @@ -70,15 +74,15 @@ class FireproofWebsitesActivity : DuckDuckGoActivity() { @Suppress("deprecation") private fun confirmDeleteWebsite(entity: FireproofWebsiteEntity) { - val message = getString(R.string.fireproofWebsiteDeleteConfirmMessage, entity.domain).html(this) - val title = getString(R.string.dialogConfirmTitle) - deleteDialog = AlertDialog.Builder(this) - .setTitle(title) - .setMessage(message) - .setPositiveButton(android.R.string.yes) { _, _ -> viewModel.delete(entity) } - .setNegativeButton(android.R.string.no) { _, _ -> } - .create() - deleteDialog?.show() + val message = HtmlCompat.fromHtml(getString(R.string.fireproofWebsiteDeleteConfirmMessage, entity.website()), HtmlCompat.FROM_HTML_MODE_LEGACY) + viewModel.delete(entity) + Snackbar.make( + fireActivityRoot, + message, + Snackbar.LENGTH_LONG + ).setAction(R.string.fireproofWebsiteSnackbarAction){ + viewModel.onSnackBarUndoFireproof(entity) + }.show() } override fun onDestroy() { diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt index 02f6f4f486a0..9ae96ce337dd 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt @@ -72,6 +72,12 @@ class FireproofWebsitesViewModel( fun onDeleteRequested(entity: FireproofWebsiteEntity) { command.value = ConfirmDeleteFireproofWebsite(entity) } + fun onSnackBarUndoFireproof(entity: FireproofWebsiteEntity){ + val domain = entity.domain + viewModelScope.launch(dispatcherProvider.io()){ + fireproofWebsiteRepository.fireproofWebsite(domain) + } + } fun delete(entity: FireproofWebsiteEntity) { viewModelScope.launch(dispatcherProvider.io()) { diff --git a/app/src/main/res/layout/activity_bookmarks.xml b/app/src/main/res/layout/activity_bookmarks.xml index 641398049a86..ccac711ec33e 100644 --- a/app/src/main/res/layout/activity_bookmarks.xml +++ b/app/src/main/res/layout/activity_bookmarks.xml @@ -17,6 +17,7 @@ --> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d86d88e34ee4..aaa4ab045c60 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,7 +194,7 @@ Bookmarks Bookmarks - Are you sure you want to delete bookmark <b>%s</b>? + Deleted <b>%s</b> Bookmark added Bookmark title Bookmark URL @@ -452,7 +452,7 @@ Fireproof Website <b>%s</b> is now fireproof! Visit Settings to learn more. Undo - Are you sure you want to delete <b>%s</b>? + <b>%s</b> is no longer fireproof! Visit Settings to learn more. No websites Fireproofed yet Websites rely on cookies to keep you signed in. When you Fireproof a site, cookies won\'t be erased and you\'ll stay signed in, even after using the Fire Button. We still block third-party trackers found on Fireproof websites. More options for fireproof website %s From 95177cfcbc87ae7a92384d97780d585a8bbbd4e8 Mon Sep 17 00:00:00 2001 From: ANOOP Date: Thu, 1 Oct 2020 18:42:37 +0530 Subject: [PATCH 2/6] corrected styling issues --- .../java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt | 2 +- .../com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt | 3 +-- .../app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt | 3 +-- .../fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt | 4 ++-- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt index d7d0dedd74e2..062290be4d0e 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt @@ -140,7 +140,7 @@ class BookmarksActivity : DuckDuckGoActivity() { bookmarkRootView, message, Snackbar.LENGTH_LONG - ).setAction(R.string.fireproofWebsiteSnackbarAction){ + ).setAction(R.string.fireproofWebsiteSnackbarAction) { viewModel.insert(bookmark) }.show() diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt index be77f7abc937..38ec45f66be8 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt @@ -31,7 +31,6 @@ import com.duckduckgo.app.global.SingleLiveEvent import io.reactivex.schedulers.Schedulers import kotlinx.coroutines.NonCancellable import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext class BookmarksViewModel( val dao: BookmarksDao, @@ -105,7 +104,7 @@ class BookmarksViewModel( dao.delete(bookmark) } } - fun insert(bookmark: BookmarkEntity){ + fun insert(bookmark: BookmarkEntity) { viewModelScope.launch(dispatcherProvider.io()) { dao.insert(BookmarkEntity(title = bookmark.title, url = bookmark.url)) } diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt index 29bff8004e1a..0ba10a1bece6 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt @@ -27,7 +27,6 @@ import com.duckduckgo.app.browser.favicon.FaviconManager import com.duckduckgo.app.fire.fireproofwebsite.data.FireproofWebsiteEntity import com.duckduckgo.app.fire.fireproofwebsite.data.website import com.duckduckgo.app.global.DuckDuckGoActivity -import com.duckduckgo.app.global.view.html import com.google.android.material.snackbar.Snackbar import kotlinx.android.synthetic.main.activity_fireproof_websites.* import kotlinx.android.synthetic.main.content_fireproof_websites.* @@ -80,7 +79,7 @@ class FireproofWebsitesActivity : DuckDuckGoActivity() { fireActivityRoot, message, Snackbar.LENGTH_LONG - ).setAction(R.string.fireproofWebsiteSnackbarAction){ + ).setAction(R.string.fireproofWebsiteSnackbarAction) { viewModel.onSnackBarUndoFireproof(entity) }.show() } diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt index 9ae96ce337dd..eaafd7f95650 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt @@ -72,9 +72,9 @@ class FireproofWebsitesViewModel( fun onDeleteRequested(entity: FireproofWebsiteEntity) { command.value = ConfirmDeleteFireproofWebsite(entity) } - fun onSnackBarUndoFireproof(entity: FireproofWebsiteEntity){ + fun onSnackBarUndoFireproof(entity: FireproofWebsiteEntity) { val domain = entity.domain - viewModelScope.launch(dispatcherProvider.io()){ + viewModelScope.launch(dispatcherProvider.io()) { fireproofWebsiteRepository.fireproofWebsite(domain) } } From edf6eb14bd46f7ad25cb4fc5ac971b3b54191a2b Mon Sep 17 00:00:00 2001 From: ANOOP Date: Wed, 7 Oct 2020 15:50:08 +0530 Subject: [PATCH 3/6] removed string resources and added new resources in string-untranslated --- .../com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt | 2 +- .../fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt | 2 +- app/src/main/res/values-bg/strings.xml | 2 -- app/src/main/res/values-cs/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-el/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-fi/strings.xml | 2 -- app/src/main/res/values-fr/strings.xml | 2 -- app/src/main/res/values-hr/strings.xml | 2 -- app/src/main/res/values-hu/strings.xml | 2 -- app/src/main/res/values-it/strings.xml | 2 -- app/src/main/res/values-lt/strings.xml | 2 -- app/src/main/res/values-lv/strings.xml | 2 -- app/src/main/res/values-nb/strings.xml | 2 -- app/src/main/res/values-nl/strings.xml | 2 -- app/src/main/res/values-pl/strings.xml | 2 -- app/src/main/res/values-pt/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-sk/strings.xml | 2 -- app/src/main/res/values-sl/strings.xml | 2 -- app/src/main/res/values-sv/strings.xml | 2 -- app/src/main/res/values-tr/strings.xml | 2 -- app/src/main/res/values/string-untranslated.xml | 6 ++++++ app/src/main/res/values/strings.xml | 2 -- 28 files changed, 8 insertions(+), 52 deletions(-) diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt index 062290be4d0e..7dd413a1baf5 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt @@ -134,7 +134,7 @@ class BookmarksActivity : DuckDuckGoActivity() { } private fun confirmDeleteBookmark(bookmark: BookmarkEntity) { - val message = getString(R.string.bookmarkDeleteConfirmMessage, bookmark.title).html(this) + val message = getString(R.string.bookmarkDeleteSnackbarMessage, bookmark.title).html(this) viewModel.delete(bookmark) Snackbar.make( bookmarkRootView, diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt index 0ba10a1bece6..369ae8a6abcd 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt @@ -73,7 +73,7 @@ class FireproofWebsitesActivity : DuckDuckGoActivity() { @Suppress("deprecation") private fun confirmDeleteWebsite(entity: FireproofWebsiteEntity) { - val message = HtmlCompat.fromHtml(getString(R.string.fireproofWebsiteDeleteConfirmMessage, entity.website()), HtmlCompat.FROM_HTML_MODE_LEGACY) + val message = HtmlCompat.fromHtml(getString(R.string.fireproofWebsiteDeleteSnackbarMessage, entity.website()), HtmlCompat.FROM_HTML_MODE_LEGACY) viewModel.delete(entity) Snackbar.make( fireActivityRoot, diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 8671c4f2de3c..b72228701b31 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -190,7 +190,6 @@ Отметки Отметки - Наистина ли искате да изтриете отметка <b>%1$s</b>? Добавена е отметка Заглавие на отметката URL адрес на отметката @@ -446,7 +445,6 @@ Огнеустойчив уебсайт <b>%1$s</b> вече е огнеустойчив! Посетете Настройки, за да научите повече. Отмяна - Сигурни ли сте, че искате да изтриете <b>%1$s</b>? Все още няма огнеустойчиви уебсайтове Уеб сайтовете разчитат на бисквитките, за да поддържат сесията ви активна. Когато направите сайта огнеустойчив, бисквитките няма да бъдат изтрити и ще останете вписани, дори след като използвате огнения бутон. Ние все пак блокираме тракери на трети страни, които се намират на огнеустойчиви сайтове. Още опции за огнеустойчивост на уебсайт %1$s diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6da291d59d32..fb301d1eda5b 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -198,7 +198,6 @@ Záložky Záložky - Opravdu chcete smazat záložku <b>%1$s</b>? Záložka přidána Název záložky URL záložky @@ -456,7 +455,6 @@ Webová stránka pro ochranu souborů <b>%1$s</b> je nyní chráněný! Další informace naleznete v části Nastavení. Vrátit - Opravdu chcete smazat <b>%1$s</b>? Žádné webové stránky zatím nejsou chráněny Webové stránky spoléhají na soubory cookie, aby vás udržely přihlášené. Když na webu zapnete ochranu, soubory cookie se nevymažou a zůstanete přihlášeni, a to i po použití tlačítka pro mazání. Stále přitom blokujeme sledovací programy třetích stran nalezené na webových stránkách s ochranou. Další možnosti pro chráněné webové stránky %1$s diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 9253992590aa..fb7b77bec8ab 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -190,7 +190,6 @@ Bogmærker Bogmærker - Er du sikker på, at du vil slette bogmærket <b>%1$s</b>? Bogmærke tilføjet Titel på bogmærke Bogmærkets URL @@ -446,7 +445,6 @@ Brandsikkert websted <b>%1$s</b> er nu brandsikkert! Besøg Indstillinger for at lære mere. Fortryd - Er du sikker på, at du vil slette <b>%1$s</b>? Der er endnu ingen brandsikrede websteder Websider er afhængige af cookies for at bevare dig logget ind. Når du Brandsikrer et websted, slettes cookies ikke, og du forbliver logget ind, selv efter, at du har brugt Brand-knappen. Vi blokerer stadig tredjeparts-trackere, der findes på Brandsikre-websteder. Flere muligheder for at brandsikre websted %1$s diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dcc128cc2087..899925108492 100755 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -193,7 +193,6 @@ Lesezeichen Lesezeichen - Bist du sicher, dass du das Lesezeichen <b>%1$s</b> löschen möchtest? Lesezeichen hinzugefügt Lesezeichen-Titel Lesezeichen-URL @@ -451,7 +450,6 @@ Feuersichere Website <b>%1$s</b> ist jetzt feuersicher! Besuchen Sie die Einstellungen, um mehr zu erfahren. Rückgängig machen - Möchten Sie <b>%1$s</b> wirklich löschen? Noch keine Websites feuersicher gemacht Websites sorgen mit Cookies dafür, dass du angemeldet bleibst. Wenn du eine Website feuerfest machst, werden Cookies nicht gelöscht und du bleibst angemeldet – auch nach Verwendung der Schaltfläche „Feuer“. Wir blockieren weiterhin auf feuerfest gemachten Websites gefundene Tracker von Dritten. Weitere Optionen für die feuersichere Website %1$s diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3d3d93fe890d..0152023f72b2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -193,7 +193,6 @@ Σελιδοδείκτες Σελιδοδείκτες - Θέλετε σίγουρα να διαγράψετε τον σελιδοδείκτη <b>%1$s</b>; Ο σελιδοδείκτης προστέθηκε Τίτλος σελιδοδείκτη Διεύθυνση URL σελιδοδείκτη @@ -451,7 +450,6 @@ Ασφαλής ιστότοπος Το <b>%1$s</b> είναι πλέον ασφαλές! Επισκεφτείτε τις Ρυθμίσεις για να μάθετε περισσότερα. Αναίρεση - Είστε βέβαιοι ότι θέλετε να διαγράψετε το <b>%1$s</b>; Δεν υπάρχουν ασφαλείς ιστιότοποι ακόμα Οι ιστότοποι βασίζονται σε cookies για να σας διατηρούν συνδεδεμένους. Όταν ενεργοποιείτε τη διαγραφή δραστηριότητας για έναν ιστότοπο, τα cookies δεν διαγράφονται και παραμένετε συνδεδεμένοι, ακόμα και μετά τη χρήση του Κουμπιού διαγραφής δραστηριότητας. Εξακολουθούμε να αποκλείουμε εφαρμογές παρακολούθησης από τρίτους που υπάρχουν σε ιστότοπους με διαγραφή δραστηριότητας. Περισσότερες επιλογές για ασφαλή ιστότοπο %1$s diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 49526243bbbb..9d02d18c3fb2 100755 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -190,7 +190,6 @@ Marcadores Marcadores - ¿Estás seguro de que quieres eliminar el marcador <b>%1$s</b>? Marcador añadido Título del marcador URL del marcador @@ -446,7 +445,6 @@ Sitio web a prueba de fuego ¡<b>%1$s</b> es ahora a prueba de fuego! Visita Ajustes para obtener más información. Deshacer - ¿Está seguro de que desea eliminar <b>%1$s</b>? Todavía no hay sitios web a prueba de fuego Los sitios web dependen de cookies para mantener tu sesión iniciada. Cuando marcas una web como «a prueba de fuego» no se borrarán las cookies y tu sesión permanecerá iniciada, incluso después de utilizar el botón Fuego. Seguiremos bloqueando rastreadores de terceros que se encuentren en sitios web a prueba de fuego. Más opciones para el sitio web a prueba de fuego %1$s diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index d7ac40051ccc..18b08737ca5c 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -208,7 +208,6 @@ Järjehoidjad Järjehoidjad - Kas soovite kindlasti kustutada järjehoidja <b>%1$s</b>? Järjehoidja lisatud Järjehoidja pealkiri Järjehoidja URL @@ -466,7 +465,6 @@ Tulekindel veebisait <b>%1$s</b> on nüüd tulekindel! Lisateabe saamiseks vaata üle seaded. Võta tagasi - Kas soovite kindlasti kustutada saidi <b>%1$s</b>? Ükski veebisait pole veel tulekindel Veebilehed kasutavad küpsiseid, et hoida sind sisse logitud. Kui teed lehe tulekindlaks, ei kustutata küpsiseid ja sa jääd sisse logituks isegi pärast tulenupu kasutamist. Me blokeerime endiselt kolmanda poole jälitajad, kelle me tulekindlatelt lehtedelt leiame. Veel tulekindla veebisaidi võimalusi %1$s diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index efd4fd1888fd..eaf59c4d6e04 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -190,7 +190,6 @@ Kirjanmerkit Kirjanmerkit - Haluatko varmasti poistaa kirjanmerkin <b>%1$s</b>? Kirjanmerkki lisätty Kirjanmerkin otsikko Kirjanmerkin URL-osoite @@ -446,7 +445,6 @@ Palonkestävä verkkosivusto <b>%1$s</b> on nyt palonkestävä! Siirry asetuksiin oppiaksesi lisää. Kumoa - Haluatko varmasti poistaa <b>%1$s</b>? Yhtään verkkosivustoa ei ole vielä merkitty palokestäväksi Verkkosivustot käyttävät evästeitä, joilla pysyt kirjautuneena sisään. Kun teet sivustosta palovarman, evästeitä ei poisteta ja pysyt kirjautuneena sisään, vaikka käytät Liekki-painiketta. Estämme edelleen kolmannen osapuolen seurannan palovarmoilla sivustoilla. Lisää vaihtoehtoja palonkestävälle verkkosivustolle %1$s diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index e19364716650..8d3d3fa8216a 100755 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -190,7 +190,6 @@ Signets Signets - Êtes-vous sûr(e) de vouloir supprimer le signet <b>%1$s</b> ? Signet ajouté Titre du signet URL du signet @@ -446,7 +445,6 @@ Site Web coupe-feu <b>%1$s</b> est maintenant coupe-feu ! Visitez Paramètres pour en savoir plus. Annuler - Voulez-vous vraiment supprimer <b>%1$s</b> ? Aucun site Web coupe-feu pour le moment Les sites Web utilisent des cookies pour maintenir votre connexion. Quand vous placez un site en mode coupe-feu, les cookies sont conservés et vous restez connecté(e), même après avoir utilisé le bouton en forme de flamme. Ceci dit, les traqueurs tiers sont bloqués sur les sites coupe-feu. Plus d\'options pour le site Web coupe-feu %1$s diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 7106bdac069d..cecff6f29545 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -198,7 +198,6 @@ Knjižne oznake Knjižne oznake - Sigurno želite izbrisati knjižnu oznaku <b>%1$s</b>? Knjižna oznaka je dodana Naslov knjižne oznake URL knjižne oznake @@ -458,7 +457,6 @@ Vatrootporna web stranica <b>%1$s</b> je sada vatrootporan! Posjetite Postavke da biste saznali više. Poništi - Jeste li sigurni da želite izbrisati <b>%1$s</b>? Još nema vatrootpornih web lokacija Mrežna mjesta oslanjaju se na kolačiće kako bi vas zadržala prijavljenim. Kada označite Fireproof za mrežno mjesto, kolačići neće biti izbrisani i ostat ćete prijavljeni, čak i nakon upotrebe gumba Fire. I dalje blokiramo alate za praćenje trećih strana koje pronađemo na mrežnim mjestima označenim kao Fireproof. Dodatne mogućnosti za vatrootpornu web stranicu %1$s diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index a918173ccdd4..a3bf3b033ccd 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -190,7 +190,6 @@ Könyvjelzők Könyvjelzők - Biztos, hogy törlöd a(z) <b>%1$s</b> könyvjelzőt? Könyvjelző hozzáadva Könyvjelző címe Könyvjelző URL @@ -446,7 +445,6 @@ Tűzálló weboldal A <b>%1$s</b> most már tűzálló! További információkért nézd meg a Beállításokat. Visszavonás - Biztos, hogy törölni akarod a (z) <b>%1$s</b> fájlt? Még nem lett tűzállóvá téve egy weboldal sem A webhelyek sütik segítségével teszik lehetővé, hogy bejelentkezve maradhass. Ha tűzállóvá teszel egy weboldalt, a sütik nem törlődnek, és még a Fire gomb használata után is bejelentkezve maradsz. A tűzálló webhelyeken a külső felek nyomkövetőit azonban blokkoljuk. További lehetőségek a %1$s tűzálló weboldalhoz diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 90df037aab38..4263c22271bf 100755 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -206,7 +206,6 @@ Segnalibri Segnalibri - Sei sicuro di voler eliminare il segnalibro <b>%1$s</b>? Segnalibro aggiunto Titolo del segnalibro URL del segnalibro @@ -462,7 +461,6 @@ Sito web a prova di bomba <b>%1$s</b> ora è a prova di bomba! Visita le Impostazioni per saperne di più. Annulla - Sei sicuro di voler eliminare <b>%1$s</b>? Ancora nessun sito web a prova di bomba Per mantenere l\'accesso degli utenti, i siti Web si affidano ai cookie. Quando attivi la Protezione per un sito, i cookie non verranno cancellati e rimarrai connesso, anche dopo aver usato il pulsante Proteggi. Continueremo a bloccare i tracker di terze parti che si trovano su siti Web protetti. Altre opzioni per impostare il sito web a prova di bomba %1$s diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index 2c83367f1d41..091f88c9c182 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -198,7 +198,6 @@ Žymelės Žymelės - Ar tikrai norite ištrinti žymelę <b>%1$s</b>? Žymelė pridėta Žymelės antraštė Žymelės URL @@ -458,7 +457,6 @@ Patikrinti svetainę <b>%1$s</b> dabar yra patikrinta! Apsilankykite „Nustatymuose“ ir sužinokite daugiau. Anuliuoti - Ar tikrai norite ištrinti <b>%1$s</b>? Dar nėra patikrintų svetainių Svetainės pagrįstos slapukais, kad liktumėte prisijungę. Pasirinkus parinktį „Fireproof“, slapukai nėra ištrinami ir liksite prisijungę net panaudoję mygtuką „Fire“. Vis tiek blokuosime trečiųjų šalių stebėjimo priemones, randamas svetainėse, kuriose pasinaudosite parinktimi „Fireproof“. Daugiau svetainės patikrinimo parinkčių %1$s diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml index 8472812e9cc8..56d1ded78fec 100644 --- a/app/src/main/res/values-lv/strings.xml +++ b/app/src/main/res/values-lv/strings.xml @@ -212,7 +212,6 @@ Grāmatzīmes Grāmatzīmes - Vai tiešām vēlaties izdzēst grāmatzīmi <b>%1$s</b>? Pievienota grāmatzīme Grāmatzīmes nosaukums Grāmatzīmju URL @@ -472,7 +471,6 @@ Ugunsdrošā tīmekļa vietne <b>%1$s</b> tagad ir ugunsdrošs! Lai uzzinātu vairāk, apmeklējiet iestatījumus. Atsaukt - Vai tiešām vēlaties izdzēst <b>%1$s</b>? Pagaidām neviena tīmekļa vietne nav ugunsdroša Vietnes lieto sīkfailus, lai tu varētu turpināt būt pierakstījies(-usies). Padarot vietni ugunsdrošu, sīkfaili netiek dzēsti, bet tu vari turpināt būt pierakstījies(-usies) arī pēc Uguns pogas lietošanas. Mēs joprojām bloķēsim trešo pušu izsekotājus, kas atrodami ugunsdrošās vietnēs. Citas iespējas ugunsdrošai tīmekļa vietnei %1$s diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml index 1d3155ac6808..aaa20038b5ca 100644 --- a/app/src/main/res/values-nb/strings.xml +++ b/app/src/main/res/values-nb/strings.xml @@ -190,7 +190,6 @@ Bokmerker Bokmerker - Er du sikker på at du vil slette bokmerket <b>%1$s</b>? Bokmerke lagt til Bokmerketittel Bokmerke-URL @@ -446,7 +445,6 @@ Brannsikkert nettsted <b>%1$s</b> er nå brannsikkert! Besøk Innstillinger for å lære mer. Angre - Er du sikker på at du vil slette <b>%1$s</b>? Ingen nettsteder brannsikre ennå Nettsider anvender informasjonskapsler for å holde deg innlogget. Når du gjør en side Brannsikker, vil ikke informasjonskapslene slettes og du holder deg innlogget, selv etter å ha brukt Brannknappen. Vi blokkerer fortsatt tredjeparters sporingsanordninger som blir funnet på Brannsikre nettsteder. Flere alternativer for brannsikkert nettsted %1$s diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 2ee5798208e9..0b2a3c84e66a 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -190,7 +190,6 @@ Bladwijzers Bladwijzers - Weet je zeker dat je bladwijzer <b>%1$s</b> wilt verwijderen? Bladwijzer toegevoegd Naam bladwijzer URL bladwijzer @@ -446,7 +445,6 @@ Brandveilige website <b>%1$s</b> is nu brandveilig! Ga naar Instellingen voor meer informatie. Ongedaan maken - Weet je zeker dat je <b>%1$s</b> wilt verwijderen? Nog geen websites brandveilig gemaakt Websites gebruiken cookies om te zorgen dat je ingelogd blijft. Als je een site brandveilig maakt, worden de cookies niet gewist en blijf je ingelogd, zelfs nadat je de vuurknop hebt gebruikt. Trackers van derden worden ook op brandveilige websites geblokkeerd. Meer opties voor een vuurvaste website %1$s diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index b048a89e8ad7..f717e4a0bcc9 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -196,7 +196,6 @@ Zakładki Zakładki - Czy na pewno chcesz usunąć zakładkę <b>%1$s</b>? Zakładka została dodana Tytuł zakładki Adres URL zakładki @@ -456,7 +455,6 @@ Bezpieczna strona internetowa <b>%1$s</b> jest teraz bezpieczna! Odwiedź Ustawienia, aby dowiedzieć się więcej. Cofnij - Czy na pewno chcesz usunąć <b>%1$s</b>? Żadne strony nie są jeszcze zabezpieczone W witrynach internetowych są wykorzystywane pliki cookie. Kiedy użyjesz w witrynie funkcji zabezpieczenia, pliki cookie nie zostaną usunięte i pozostaniesz zalogowany(-a) nawet po użyciu przycisku Zabezpiecz. Nadal blokujemy narzędzia śledzące innych firm znalezione w zabezpieczonych witrynach. Więcej opcji dla bezpiecznej strony internetowej %1$s diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 29624ed88051..d1ec837851c5 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -190,7 +190,6 @@ Marcadores Marcadores - Tem a certeza de que pretende eliminar o marcador <b>%1$s</b>? Marcador adicionado Título do marcador URL do marcador @@ -446,7 +445,6 @@ Site à prova de fogo <b>%1$s</b> já é à prova de fogo! Aceda a Configurações para saber mais. Anular - Tem a certeza de que deseja eliminar <b>%1$s</b>? Ainda não há sites à prova de fogo Os websites confiam nos cookies para o manter ligado. Quando se utiliza uma barreira de segurança num site, os cookies não serão apagados e permanecerá ligado, mesmo depois de utilizar o botão de segurança. Ainda bloqueamos rastreadores de terceiros encontrados em sites com barreiras de segurança. Mais opções para o site à prova de fogo %1$s diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index 5a23b0622cea..c6ff83f4269f 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -194,7 +194,6 @@ Semne de carte Semne de carte - Sunteți sigur că doriți să ștergeți semnul de carte <b>%1$s</b>? Semn de carte adăugat Titlu semn de carte Adresă URL semn de carte @@ -452,7 +451,6 @@ Website ignifug <b>%1$s</b> este acum ignifugat! Accesați Setări pentru a afla mai multe. Anulați - Sigur doriți să ștergeți <b>%1$s</b>? Niciun site web nu a fost ignorat încă Site-urile web se bazează pe cookie-uri pentru a te menține conectat. Atunci când ștergi activitatea și istoricul unui site, cookie-urile nu vor fi șterse și vei rămâne conectat, chiar și după utilizarea butonului Ștergere activitate și istoric. Blocăm totuși instrumentele de urmărire terțe găsite pe site-urile web la care la ieșire se șterge activitatea și istoricul din browser. Mai multe opțiuni pentru site-ul ignifug %1$s diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 4bba4342a8e8..10fa6f1e5247 100755 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -214,7 +214,6 @@ Закладки Закладки - Вы действительно хотите удалить закладку <b>%1$s</b>? Закладка добавлена Название закладки URL закладки @@ -474,7 +473,6 @@ Обезопасить сайт <b>%1$s</b> теперь безопасен! Зайдите в Настройки, чтобы узнать больше. Отменить действие - Вы уверены, что хотите удалить <b>%1$s</b>? Ни один сайт пока не защищен Чтобы вам не приходилось каждый раз входить в свою учетную запись, сайты используют куки-файлы. Если сделать сайт «огнеупорным», мы не будем стирать его куки-файлы, даже если вы воспользуетесь кнопкой «Огонь». Но мы по-прежнему будем блокировать сторонние трекеры, в том числе на огнеупорных сайтах. Дополнительные параметры для безопасного сайта %1$s diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 583a05b40957..1ad6609c3f84 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -198,7 +198,6 @@ Záložky Záložky - Naozaj chcete odstrániť záložku <b>%1$s</b>? Záložka je pridaná Názov záložky Webová adresa záložky @@ -458,7 +457,6 @@ Zabezpečiť webovú stránku <b>%1$s</b> je teraz zabezpečená! Viac informácií nájdete na stránke Nastavenia. Vrátenie späť - Naozaj chcete odstrániť <b>%1$s</b>? Zatiaľ nie sú k dispozícii žiadne webové stránky Webové stránky sa spoliehajú na súbory cookie, aby ste zostali prihlásení. Keď webovú stránku zabezpečíte funkciou ohňovzdornosti, súbory cookie nebudú zmazané a zostanete prihlásení aj po použití tlačidla Oheň. Stále budeme blokovať sledovacie zariadenia tretích strán, ktoré sa nachádzajú na webových stránkach zabezpečených funkciou ohňovzdornosti. Ďalšie možnosti pre zabezpečenú webovú stránku %1$s diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 54471566d408..8617516bad49 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -198,7 +198,6 @@ Zaznamki Zaznamki - Ste prepričani, da želite izbrisati zaznamek <b>%1$s</b>? Zaznamek je dodan Naslov zaznamka URL zaznamka @@ -458,7 +457,6 @@ Spletna stran s požarno zaščito <b>%1$s</b> ima sedaj požarno zaščito! Za več informacij obiščite Nastavitve. Prekliči spremembe - Ste prepričani, da želite izbrisati <b>%1$s</b>? Nobena spletna stran še nima požarne zaščite Spletne strani se zanašajo na piškotke, da boš vedno prijavljen. Ko spletno mesto požarno zaščitiš, piškotki ne bodo izbrisani in ostal boš prijavljen, tudi po uporabi gumba Fire. Še vedno blokiramo zunanje sledilce, ki jih najdemo na požarno izoliranih spletnih mestih. Več možnosti za stran s požarno zaščito %1$s diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index edee88dd3f6a..5db458cd05eb 100755 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -206,7 +206,6 @@ Bokmärken Bokmärken - Är du säker på att du vill radera bokmärket <b>%1$s</b>? Bokmärket har lagts till Bokmärkesrubrik Bokmärkets URL @@ -462,7 +461,6 @@ Brandsäker webbplats <b>%1$s</b> är nu brandsäker! Besök Inställningar för att lära dig mer. Återställ - Är du säker på att du vill ta bort <b>%1$s</b>? Inga webbplatser är brandsäkra än Webbplatser använder kakor för att hålla dig inloggad. Om du brandsäkrar en webbplats kommer kakor inte att raderas och du förblir inloggad även efter att du har använt brännarknappen. Vi blockerar fortfarande tredje parters spårare som finns på brandsäkrade webbplatser. Fler alternativ för brandsäker webbplats %1$s diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 53e7cc6db057..d99cc1d316b9 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -208,7 +208,6 @@ Yer imleri Yer imleri - <b>%1$s</b> yer imini silmek istediğinizden emin misiniz? Yer imi eklendi Yer imi başlığı Yer imi URL\'si @@ -466,7 +465,6 @@ Korumalı Web Sitesi <b>%1$s</b> artık koruma altında! Daha fazla bilgi edinmek için Ayarlar\'a gidin. Geri al - <b>%1$s</b> \'ı silmek istediğinizden emin misiniz? Henüz hiçbir web sitesi koruma altına alınmadı Web siteleri oturumunuzu açık tutmak için çerezler kullanır. Bir siteyi Yanmaya Dayanıklı hâle getirdiğinizde çerezler silinmez ve Yangın Düğmesi\'ni kullandıktan sonra bile oturumunuz açık kalır. Yanmaya Dayanıklı web sitelerinde bulunan üçüncü taraf izleyicileri yine engelleriz. Korumalı web sitesi %1$s için daha fazla seçenek diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml index 17c950ca588b..9315930a95c9 100644 --- a/app/src/main/res/values/string-untranslated.xml +++ b/app/src/main/res/values/string-untranslated.xml @@ -51,4 +51,10 @@ Denied You previously granted %s permission to access your device location. + + <b>%s</b> is no longer fireproof! Visit Settings to learn more. + + + Deleted <b>%s</b> + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aaa4ab045c60..3f4f0e0ace17 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -194,7 +194,6 @@ Bookmarks Bookmarks - Deleted <b>%s</b> Bookmark added Bookmark title Bookmark URL @@ -452,7 +451,6 @@ Fireproof Website <b>%s</b> is now fireproof! Visit Settings to learn more. Undo - <b>%s</b> is no longer fireproof! Visit Settings to learn more. No websites Fireproofed yet Websites rely on cookies to keep you signed in. When you Fireproof a site, cookies won\'t be erased and you\'ll stay signed in, even after using the Fire Button. We still block third-party trackers found on Fireproof websites. More options for fireproof website %s From 35d4795df37443615b51875e7abe3c95440a0917 Mon Sep 17 00:00:00 2001 From: ANOOP Date: Wed, 7 Oct 2020 16:28:32 +0530 Subject: [PATCH 4/6] removed string resources and added new resources in string-untranslated --- app/src/main/res/values/string-untranslated.xml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml index 9315930a95c9..a4dc0cf5ee59 100644 --- a/app/src/main/res/values/string-untranslated.xml +++ b/app/src/main/res/values/string-untranslated.xml @@ -50,11 +50,7 @@ Granted Denied You previously granted %s permission to access your device location. - - <b>%s</b> is no longer fireproof! Visit Settings to learn more. - - Deleted <b>%s</b> From b943f3a8530c0b8b9dd63497bfcc9dd09031b685 Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Fri, 8 Jan 2021 15:11:28 +0100 Subject: [PATCH 5/6] added missing tests and updated strings --- .../app/bookmarks/ui/BookmarksViewModelTest.kt | 6 ++++++ .../ui/FireproofWebsitesViewModelTest.kt | 11 +++++++++++ .../duckduckgo/app/bookmarks/ui/BookmarksActivity.kt | 8 ++++---- .../duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt | 1 + .../fireproofwebsite/ui/FireproofWebsitesActivity.kt | 8 ++++---- .../fireproofwebsite/ui/FireproofWebsitesViewModel.kt | 1 + app/src/main/res/values/string-untranslated.xml | 5 +++++ 7 files changed, 32 insertions(+), 8 deletions(-) diff --git a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt index d0a8221a71d1..2e1cd32c9033 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModelTest.kt @@ -117,4 +117,10 @@ class BookmarksViewModelTest { testee.delete(bookmark) verify(faviconManager).deletePersistedFavicon(bookmark.url) } + + @Test + fun whenBookmarkInsertedThenDaoUpdated() { + testee.insert(bookmark) + verify(bookmarksDao).insert(bookmark) + } } diff --git a/app/src/androidTest/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModelTest.kt b/app/src/androidTest/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModelTest.kt index 9590ba085bb6..d18940899a72 100644 --- a/app/src/androidTest/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModelTest.kt +++ b/app/src/androidTest/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModelTest.kt @@ -167,6 +167,17 @@ class FireproofWebsitesViewModelTest { verify(settingsDataStore).appLoginDetection = true } + @Test + fun whenUserUndosDeleteFireproofThenSiteIsAddedBack() { + + val entity = FireproofWebsiteEntity("domain.com") + + viewModel.onSnackBarUndoFireproof(entity) + + verify(mockViewStateObserver, atLeastOnce()).onChanged(viewStateCaptor.capture()) + assertTrue(viewStateCaptor.value.fireproofWebsitesEntities.isNotEmpty()) + } + private inline fun assertCommandIssued(instanceAssertions: T.() -> Unit = {}) { verify(mockCommandObserver, atLeastOnce()).onChanged(commandCaptor.capture()) val issuedCommand = commandCaptor.allValues.find { it is T } diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt index 6960965836d4..81e274186dcc 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksActivity.kt @@ -140,12 +140,12 @@ class BookmarksActivity : DuckDuckGoActivity() { } private fun confirmDeleteBookmark(bookmark: BookmarkEntity) { - val message = getString(R.string.bookmarkDeleteSnackbarMessage, bookmark.title).html(this) + val message = getString(R.string.bookmarkDeleteConfirmationMessage, bookmark.title).html(this) viewModel.delete(bookmark) Snackbar.make( - bookmarkRootView, - message, - Snackbar.LENGTH_LONG + bookmarkRootView, + message, + Snackbar.LENGTH_LONG ).setAction(R.string.fireproofWebsiteSnackbarAction) { viewModel.insert(bookmark) }.show() diff --git a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt index 38ec45f66be8..b550a3f36744 100644 --- a/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/bookmarks/ui/BookmarksViewModel.kt @@ -104,6 +104,7 @@ class BookmarksViewModel( dao.delete(bookmark) } } + fun insert(bookmark: BookmarkEntity) { viewModelScope.launch(dispatcherProvider.io()) { dao.insert(BookmarkEntity(title = bookmark.title, url = bookmark.url)) diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt index a5e6e15a2408..9ec7bd13cace 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesActivity.kt @@ -79,12 +79,12 @@ class FireproofWebsitesActivity : DuckDuckGoActivity() { @Suppress("deprecation") private fun confirmDeleteWebsite(entity: FireproofWebsiteEntity) { - val message = HtmlCompat.fromHtml(getString(R.string.fireproofWebsiteDeleteSnackbarMessage, entity.website()), HtmlCompat.FROM_HTML_MODE_LEGACY) + val message = HtmlCompat.fromHtml(getString(R.string.fireproofWebsiteRemovalConfirmation, entity.website()), HtmlCompat.FROM_HTML_MODE_LEGACY) viewModel.delete(entity) Snackbar.make( - fireActivityRoot, - message, - Snackbar.LENGTH_LONG + fireActivityRoot, + message, + Snackbar.LENGTH_LONG ).setAction(R.string.fireproofWebsiteSnackbarAction) { viewModel.onSnackBarUndoFireproof(entity) }.show() diff --git a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt index eaafd7f95650..b4878f8d1924 100644 --- a/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt +++ b/app/src/main/java/com/duckduckgo/app/fire/fireproofwebsite/ui/FireproofWebsitesViewModel.kt @@ -72,6 +72,7 @@ class FireproofWebsitesViewModel( fun onDeleteRequested(entity: FireproofWebsiteEntity) { command.value = ConfirmDeleteFireproofWebsite(entity) } + fun onSnackBarUndoFireproof(entity: FireproofWebsiteEntity) { val domain = entity.domain viewModelScope.launch(dispatcherProvider.io()) { diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml index 80260c9e6c33..826644a070dc 100644 --- a/app/src/main/res/values/string-untranslated.xml +++ b/app/src/main/res/values/string-untranslated.xml @@ -25,4 +25,9 @@ Success! %s has been added to your home screen. Checking your feed in DuckDuckGo is a great alternative to using the Facebook app!<br/><br/>But if the Facebook app is on your phone, it can make requests for data even when you\'re not using it.<br/><br/>Prevent this by deleting it now! + + <b>%s</b> is no longer Fireproof + + + <b>%s</b> is no longer a Bookmark From fcfebba1f6b330b8fef860f0f5c01d2f7f1d5f1b Mon Sep 17 00:00:00 2001 From: David Gonzalez Date: Fri, 5 Feb 2021 14:55:04 +0100 Subject: [PATCH 6/6] updated strings to match copy review --- .../main/res/values/string-untranslated.xml | 4 +- versions.properties | 41 +++++++++++++++++++ 2 files changed, 43 insertions(+), 2 deletions(-) create mode 100644 versions.properties diff --git a/app/src/main/res/values/string-untranslated.xml b/app/src/main/res/values/string-untranslated.xml index 826644a070dc..fd6de98d180b 100644 --- a/app/src/main/res/values/string-untranslated.xml +++ b/app/src/main/res/values/string-untranslated.xml @@ -26,8 +26,8 @@ Checking your feed in DuckDuckGo is a great alternative to using the Facebook app!<br/><br/>But if the Facebook app is on your phone, it can make requests for data even when you\'re not using it.<br/><br/>Prevent this by deleting it now! - <b>%s</b> is no longer Fireproof + Fireproofing removed for <b>%s</b> - <b>%s</b> is no longer a Bookmark + Deleted <b>%s</b> diff --git a/versions.properties b/versions.properties new file mode 100644 index 000000000000..5406f4d1d2af --- /dev/null +++ b/versions.properties @@ -0,0 +1,41 @@ +## suppress inspection "SpellCheckingInspection" for whole file +## suppress inspection "UnusedProperty" for whole file +## +## Dependencies and Plugin versions with their available updates +## Generated by $ ./gradlew refreshVersions +## Please, don't put extra comments in that file yet, keeping them is not supported yet. + +version.androidx.appcompat=1.2.0 +version.androidx.arch.core=2.1.0 +version.androidx.constraintlayout=2.0.4 +version.androidx.core=1.3.2 +version.androidx.fragment=1.2.5 +version.androidx.legacy=1.0.0 +version.androidx.lifecycle=2.2.0 +version.androidx.room=2.2.5 +version.androidx.swiperefreshlayout=1.1.0 +version.androidx.test=1.3.0 +version.androidx.webkit=1.3.0 +version.androidx.work=2.4.0 +version.com.airbnb.android..lottie=3.4.0 +version.com.android.installreferrer..installreferrer=1.1.2 +version.com.github.bumptech.glide..compiler=4.11.0 +version.com.github.bumptech.glide..glide=4.11.0 +version.com.github.bumptech.glide..okhttp3-integration=4.11.0 +version.com.jakewharton.retrofit..retrofit2-kotlin-coroutines-adapter=0.9.2 +version.com.jakewharton.rxrelay2..rxrelay=2.0.0 +version.com.jakewharton.timber..timber=4.7.1 +version.com.nhaarman.mockitokotlin2..mockito-kotlin=2.1.0 +version.google.android.material=1.2.1 +version.google.dagger=2.27 +version.io.reactivex.rxjava2..rxandroid=2.0.2 +version.io.reactivex.rxjava2..rxjava=2.1.10 +version.kotlin=1.4.10 +version.kotlinx.coroutines=1.3.5 +version.leakcanary=2.5 +version.okhttp3=4.9.0 +version.org.apache.commons..commons-math3=3.6.1 +version.org.jetbrains.anko..anko-commons=0.10.4 +version.org.jetbrains.anko..anko-design=0.10.4 +version.org.mockito..mockito-android=3.4.6 +version.retrofit2=2.8.1 \ No newline at end of file