diff --git a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
index 2ae74529f5de..c110fe0c58b7 100644
--- a/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
+++ b/app/src/main/java/com/duckduckgo/app/feedback/ui/initial/InitialFeedbackFragment.kt
@@ -16,13 +16,17 @@
package com.duckduckgo.app.feedback.ui.initial
+import android.app.UiModeManager
import android.os.Bundle
+import androidx.core.content.ContextCompat.getSystemService
import com.duckduckgo.anvil.annotations.InjectWith
import com.duckduckgo.app.browser.R
import com.duckduckgo.app.browser.databinding.ContentFeedbackBinding
import com.duckduckgo.app.feedback.ui.common.FeedbackFragment
import com.duckduckgo.app.feedback.ui.initial.InitialFeedbackFragmentViewModel.Command.*
-import com.duckduckgo.common.ui.DuckDuckGoTheme
+import com.duckduckgo.common.ui.DuckDuckGoTheme.DARK
+import com.duckduckgo.common.ui.DuckDuckGoTheme.LIGHT
+import com.duckduckgo.common.ui.DuckDuckGoTheme.SYSTEM_DEFAULT
import com.duckduckgo.common.ui.store.ThemingDataStore
import com.duckduckgo.common.ui.viewbinding.viewBinding
import com.duckduckgo.di.scopes.FragmentScope
@@ -50,15 +54,29 @@ class InitialFeedbackFragment : FeedbackFragment(R.layout.content_feedback) {
override fun onActivityCreated(savedInstanceState: Bundle?) {
super.onActivityCreated(savedInstanceState)
- if (themingDataStore.theme == DuckDuckGoTheme.LIGHT) {
- binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_light_theme)
- binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_light_theme)
- } else {
- binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_dark_theme)
- binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_dark_theme)
+ when (themingDataStore.theme) {
+ SYSTEM_DEFAULT -> {
+ val uiManager = getSystemService(requireContext(), UiModeManager::class.java)
+ when (uiManager?.nightMode) {
+ UiModeManager.MODE_NIGHT_YES -> renderDarkButtons()
+ else -> renderLightButtons()
+ }
+ }
+ DARK -> renderDarkButtons()
+ LIGHT -> renderLightButtons()
}
}
+ private fun renderLightButtons() {
+ binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_light_theme)
+ binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_light_theme)
+ }
+
+ private fun renderDarkButtons() {
+ binding.positiveFeedbackButton.setImageResource(R.drawable.button_happy_dark_theme)
+ binding.negativeFeedbackButton.setImageResource(R.drawable.button_sad_dark_theme)
+ }
+
override fun configureViewModelObservers() {
viewModel.command.observe(this) {
when (it) {
diff --git a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt
index acded73d4e11..4ab3b36d825d 100644
--- a/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt
+++ b/app/src/main/java/com/duckduckgo/app/settings/NewSettingsActivity.kt
@@ -71,6 +71,7 @@ import com.duckduckgo.autofill.api.AutofillScreens.AutofillSettingsScreen
import com.duckduckgo.autofill.api.AutofillSettingsLaunchSource
import com.duckduckgo.common.ui.DuckDuckGoActivity
import com.duckduckgo.common.ui.view.gone
+import com.duckduckgo.common.ui.view.listitem.DaxListItem.IconSize.Small
import com.duckduckgo.common.ui.view.listitem.TwoLineListItem
import com.duckduckgo.common.ui.view.show
import com.duckduckgo.common.ui.viewbinding.viewBinding
@@ -201,6 +202,7 @@ class NewSettingsActivity : DuckDuckGoActivity() {
with(viewsOther) {
aboutSetting.setOnClickListener { viewModel.onAboutSettingClicked() }
shareFeedbackSetting.setOnClickListener { viewModel.onShareFeedbackClicked() }
+ ddgOnOtherPlatformsSetting.setTrailingIconSize(Small)
ddgOnOtherPlatformsSetting.setOnClickListener { viewModel.onDdgOnOtherPlatformsClicked() }
}
}
diff --git a/app/src/main/res/layout/activity_private_search.xml b/app/src/main/res/layout/activity_private_search.xml
index 7946d3b81f42..a05d9e3b99f4 100644
--- a/app/src/main/res/layout/activity_private_search.xml
+++ b/app/src/main/res/layout/activity_private_search.xml
@@ -77,7 +77,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/keyline_5"
- android:layout_marginTop="@dimen/keyline_4"
+ android:layout_marginTop="@dimen/keyline_2"
android:gravity="center"
android:text="@string/privateSearchActivityTitle"
android:visibility="gone"
diff --git a/app/src/main/res/layout/activity_web_tracking_protection.xml b/app/src/main/res/layout/activity_web_tracking_protection.xml
index e6b1cf1a2c68..9813fc7ef28d 100644
--- a/app/src/main/res/layout/activity_web_tracking_protection.xml
+++ b/app/src/main/res/layout/activity_web_tracking_protection.xml
@@ -67,7 +67,7 @@
android:layout_marginTop="@dimen/keyline_4"
android:layout_marginEnd="@dimen/keyline_4"
android:gravity="center"
- android:text="@string/webTrackingProtectionTitle"
+ android:text="@string/webTrackingProtectionIsEnabledTitle"
app:typography="h2"
tools:visibility="gone" />
diff --git a/app/src/main/res/layout/content_settings_new_other.xml b/app/src/main/res/layout/content_settings_new_other.xml
index 1bf3fec4d50c..d9fafa0ef74c 100644
--- a/app/src/main/res/layout/content_settings_new_other.xml
+++ b/app/src/main/res/layout/content_settings_new_other.xml
@@ -46,6 +46,7 @@
android:layout_height="wrap_content"
app:leadingIcon="@drawable/ic_downloads_color_24"
app:primaryText="@string/settingsDDGOnOtherPlatforms"
- app:trailingIcon="@drawable/ic_open_in_24" />
+ app:trailingIcon="@drawable/ic_open_in_16"
+ app:trailingIconTint="?attr/daxColorSecondaryIcon"/>
diff --git a/app/src/main/res/layout/content_settings_new_privacy.xml b/app/src/main/res/layout/content_settings_new_privacy.xml
index 3d31f63146c2..5ff5f3c9036a 100644
--- a/app/src/main/res/layout/content_settings_new_privacy.xml
+++ b/app/src/main/res/layout/content_settings_new_privacy.xml
@@ -25,7 +25,7 @@
android:id="@+id/settingsPrivacyTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:primaryText="@string/settingsHeadingPrivacyProtections" />
+ app:primaryText="@string/settingsHeadingProtections" />
+ app:primaryText="@string/settingsEmailProtectionTitle" />
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index f5d1f62abc61..99bc72f6a4d3 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -125,7 +125,7 @@
Настройки
Настройки
Поверителност
- Защита на поверителността
+ Защити
Външен вид
Персонализиране
За нас
@@ -158,14 +158,14 @@
Защита от проследяване в мрежата
Активирано по подразбиране
Настройки
- Основни настройки
+ Други Настройки
Разрешения
Синхронизиране и архивиране
Fire Button
Изчистване на данни
Добавяне на приспособлението към началния екран
Задайте позицията на адресната лента
- Активиране на гласово търсене
+ Активиране на поверително гласово търсене
DuckDuckGo на други платформи
@@ -190,7 +190,8 @@
Защита от проследяване в мрежата
Защита от проследяване в мрежата
- Защитата от проследяване в мрежата е активирана
+ Защитата от проследяване в мрежата е активирана
+ Защита от проследяване в мрежата
Научете повече]]>
Научете повече]]>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 1c563fc20170..f8e636320d6d 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -125,7 +125,7 @@
Nastavení
Nastavení
Soukromí
- Ochrana osobních údajů
+ Ochrany
Vzhled
Přizpůsobit
Informace
@@ -158,14 +158,14 @@
Ochrana před sledováním na webu
Ve výchozím nastavení povoleno
Nastavení
- Hlavní nastavení
+ Další nastavení
Oprávnění
Synchronizace a zálohování
Fire Button
Vymazání dat
Přidat widget na domovskou obrazovku
Nastavte pozici adresního řádku
- Povolit hlasové vyhledávání
+ Povolit soukromé hlasové vyhledávání
DuckDuckGo na jiných platformách
@@ -190,7 +190,8 @@
Ochrana před sledováním na webu
Ochrana před sledováním na webu
- Ochrana před sledováním na webu je povolená
+ Ochrana před sledováním na webu je povolená
+ Ochrana před sledováním na webu
Další informace]]>
Další informace]]>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index fe84551a3e7c..9db99788dbc3 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -125,7 +125,7 @@
Indstillinger
Indstillinger
Privatliv
- Beskyttelse af privatlivet
+ Beskyttelser
udseende
Tilpas
Omkring
@@ -158,14 +158,14 @@
Beskyttelse mod sporing på nettet
Aktiveret som standard
Indstillinger
- Generelle indstillinger
+ Andre indstillinger
Tilladelser
Synkronisering og sikkerhedskopiering
Fire Button
Datarydning
Tilføj widget til startskærmen
Angiv placeringen af adresselinjen
- Aktivér stemmesøgning
+ Aktiver privat stemmesøgning
DuckDuckGo på andre platforme
@@ -190,7 +190,8 @@
Beskyttelse mod sporing på nettet
Beskyttelse mod sporing på nettet
- Beskyttelse mod sporing på nettet er aktiveret
+ Beskyttelse mod sporing på nettet er aktiveret
+ Beskyttelse mod sporing på nettet
Lær mere]]>
Mere info]]>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 185c9c7de9cc..5c0e9e01f5e4 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -125,7 +125,7 @@
Einstellungen
Einstellungen
Privatsphäre
- Datenschutz
+ Schutz
Aussehen
Anpassen
Über
@@ -158,14 +158,14 @@
Web Tracking Protection
Standardmäßig aktiviert
Einstellungen
- Haupteinstellungen
+ Andere Einstellungen
Berechtigungen
Synchronisieren und sichern
Fire Button
Datenlöschung
Widget zum Startbildschirm hinzufügen
Position deiner Adressleiste festlegen
- Sprachsuche aktivieren
+ Private Sprachsuche aktivieren
DuckDuckGo auf anderen Plattformen
@@ -190,7 +190,8 @@
Web Tracking Protection
Web Tracking Protection
- Web Tracking Protection ist aktiviert
+ Web Tracking Protection ist aktiviert
+ Web Tracking Protection
Mehr erfahren]]>
Mehr erfahren]]>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 1cf111eaa565..ce52fe464d0d 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -125,7 +125,7 @@
Ρυθμίσεις
Ρυθμίσεις
Ιδιωτικότητα
- Προστασία προσωπικών δεδομένων
+ Προστασίες
Εμφάνιση
Προσαρμογή
Σχετικά
@@ -158,14 +158,14 @@
Προστασία παρακολούθησης ιστού
Ενεργοποιημένο βάσει προεπιλογής
Ρυθμίσεις
- Κύριες ρυθμίσεις
+ Άλλες Ρυθμίσεις
Δικαιώματα
Συγχρονισμός και δημιουργία αντιγράφων ασφαλείας
Κουμπί Φωτιά
Διαγραφή δεδομένων
Προσθήκη μικροεφαρμογής στην Αρχική οθόνη
Ορίστε τη θέση της γραμμής διευθύνσεών σας
- Ενεργοποίηση φωνητικής αναζήτησης
+ Ενεργοποίηση της Ιδιωτικής φωνητικής αναζήτησης
Το DuckDuckGo σε άλλες πλατφόρμες
@@ -190,7 +190,8 @@
Προστασία παρακολούθησης ιστού
Προστασία παρακολούθησης ιστού
- Η προστασία παρακολούθησης ιστού είναι ενεργοποιημένη
+ Η προστασία παρακολούθησης ιστού είναι ενεργοποιημένη
+ Προστασία παρακολούθησης ιστού
Μάθετε περισσότερα]]>
Μάθετε περισσότερα]]>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index c112cef65c27..32f3600b3e61 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -125,7 +125,7 @@
Ajustes
Ajustes
Privacidad
- Protecciones de privacidad
+ Protecciones
Apariencia
Personalizar
Sobre
@@ -158,14 +158,14 @@
Protección de rastreo en la web
Habilitado de forma predeterminada
Ajustes
- Ajustes principales
+ Otras opciones
Permisos
Sincronización y copia de seguridad
Fire Button
Eliminación de datos
Añadir widget a la pantalla de inicio
Establece la posición de la barra de direcciones
- Habilitar búsqueda por voz
+ Activar la búsqueda privada por voz
DuckDuckGo en otras plataformas
@@ -190,7 +190,8 @@
Protección de rastreo en la web
Protección de rastreo en la web
- La protección de rastreo en la web está habilitada
+ La protección de rastreo en la web está habilitada
+ Protección de rastreo en la web
Más información]]>
Más información]]>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index b48f3acf6661..65a5db8a3838 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -125,7 +125,7 @@
Sätted
Sätted
Privaatsus
- Privaatsuskaitsed
+ Kaitsed
Välimus
Kohanda
Teave
@@ -158,14 +158,14 @@
Veebijälgimise kaitse
Vaikimisi sisse lülitatud
Sätted
- Peamised seaded
+ Teised seaded
Load
Sünkroonimine ja varundamine
Fire Button
Andmete kustutamine
Lisa vidin avakuvale
Määra aadressiriba asukoht
- Luba häälotsing
+ Luba privaatne häälotsing
DuckDuckGo muudel platvormidel
@@ -190,7 +190,8 @@
Veebijälgimise kaitse
Veebijälgimise kaitse
- Veebijälgimise kaitse on lubatud
+ Veebijälgimise kaitse on lubatud
+ Veebijälgimise kaitse
Lisateave]]>
Loe edasi]]>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 66af8f933dc6..cd63b24dceaf 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -125,7 +125,7 @@
Asetukset
Asetukset
Tietosuoja
- Yksityisyyden suoja
+ Suojaukset
Ulkoasu
Mukauta
Tietoa meistä
@@ -158,14 +158,14 @@
Verkkoseurannan suojaus
Oletusarvoisesti käytössä
Asetukset
- Pääasetukset
+ Muut asetukset
Käyttöoikeudet
Synkronoi ja varmuuskopioi
Fire-painike
Datan tyhjentäminen
Lisää widget aloitusnäyttöön
Aseta osoitekentän sijainti
- Ota käyttöön äänihaku
+ Ota yksityinen äänihaku käyttöön
DuckDuckGo muilla alustoilla
@@ -190,7 +190,8 @@
Verkkoseurannan suojaus
Verkkoseurannan suojaus
- Verkkoseurantasuojaus on käytössä
+ Verkkoseurantasuojaus on käytössä
+ Verkkoseurannan suojaus
Lisätietoja]]>
Lue lisää]]>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 742463b18ff4..48ff288f8bdd 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -125,7 +125,7 @@
Paramètres
Paramètres
Confidentialité
- Protections de la confidentialité
+ Protections
Apparence
Personnaliser
À propos
@@ -158,14 +158,14 @@
Protection contre le pistage sur le Web
Activation par défaut
Paramètres
- Réglages principaux
+ Autres paramètres
Autorisations
Synchronisation et sauvegarde
Fire Button
Effacement des données
Ajouter le widget à l\'écran d\'accueil
Définissez la position de votre barre d\'adresse
- Activez la recherche vocale
+ Activer la recherche vocale privée
DuckDuckGo sur d\'autres plateformes
@@ -190,7 +190,8 @@
Protection contre le pistage sur le Web
Protection contre le pistage sur le Web
- La protection contre le pistage sur le Web est activée
+ La protection contre le pistage sur le Web est activée
+ Protection contre le pistage sur le Web
En savoir plus]]>
En savoir plus]]>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 59257f9b1974..9c0da9e13be0 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -125,7 +125,7 @@
Postavke
Postavke
Zaštita privatnosti
- Zaštita privatnosti
+ Zaštite
Izgled
Prilagodba
O
@@ -158,14 +158,14 @@
Zaštita od praćenja na webu
Omogućeno prema zadanim postavkama
Postavke
- Glavne postavke
+ Ostale postavke
Dozvole
Sinkronizacija i sigurnosno kopiranje
Fire Button
Brisanje podataka
Dodajte widget na početni zaslon
Postavi položaj adresne trake
- Omogući glasovno pretraživanje
+ Omogući privatno glasovno pretraživanje
DuckDuckGo na drugim platformama
@@ -190,7 +190,8 @@
Zaštita od praćenja na webu
Zaštita od praćenja na webu
- Zaštita od praćenja na webu je omogućena
+ Zaštita od praćenja na webu je omogućena
+ Zaštita od praćenja na webu
Saznaj više]]>
Saznaj više]]>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index d6e0ecc361ab..85a05e2c0aa0 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -125,7 +125,7 @@
Beállítások
Beállítások
Adatvédelem
- Adatvédelem
+ Védelem
Megjelenés
Testreszabás
További információ
@@ -158,14 +158,14 @@
Webes követés elleni védelem
Alapértelmezés szerint engedélyezve
Beállítások
- Főbeállítások
+ További beállítások
Engedélyek
Szinkronizálás és biztonsági mentés
Tűz gomb
Adattörlés
Minialkalmazás hozzáadása a kezdőképernyőhöz
Állítsd be a címsor elhelyezkedését
- Beszédhangalapú keresés engedélyezése
+ Privát beszédhangalapú keresés engedélyezése
DuckDuckGo más platformokhoz
@@ -190,7 +190,8 @@
Webes követés elleni védelem
Webes követés elleni védelem
- A webes követés elleni védelem engedélyezve van
+ A webes követés elleni védelem engedélyezve van
+ Webes követés elleni védelem
További részletek]]>
További részletek]]>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6935fb532072..8dca941e6e92 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -125,7 +125,7 @@
Impostazioni
Impostazioni
Privacy
- Protezioni della Privacy
+ Protezioni
Aspetto
Personalizza
Informazioni
@@ -158,14 +158,14 @@
Protezione dal tracciamento web
Abilitato per impostazione predefinita
Impostazioni
- Impostazioni principali
+ Altre impostazioni
Autorizzazioni
Sincronizzazione e backup
Fire Button
Cancellazione dati
Aggiungi widget alla schermata iniziale
Imposta la posizione della barra degli indirizzi
- Abilita ricerca vocale
+ Attiva la ricerca vocale privata
DuckDuckGo su altre piattaforme
@@ -190,7 +190,8 @@
Protezione dal tracciamento web
Protezione dal tracciamento web
- La protezione dal tracciamento Web è abilitata
+ La protezione dal tracciamento Web è abilitata
+ Protezione dal tracciamento web
Ulteriori informazioni]]>
Ulteriori informazioni]]>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index ebbc6f118e07..27a315fc87b5 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -125,7 +125,7 @@
Nustatymai
Nustatymai
Privatumas
- Privatumo apsaugos priemonės
+ Apsaugos
Išvaizda
Tinkinti
Apie
@@ -158,14 +158,14 @@
Apsauga nuo žiniatinklio sekimo
Įjungta pagal numatytuosius nustatymus
Nustatymai
- Pagrindiniai nustatymai
+ Kiti parametrai
Leidimai
Sinchronizuoti ir kurti atsarginę kopiją
Mygtukas „Fire“
Duomenų valymas
Įtraukti valdiklį į pagrindinį ekraną
Nustatykite adreso juostos padėtį
- Įgalinti paiešką balsu
+ Įjungti privačią paiešką balsu
„DuckDuckGo“ kitose platformose
@@ -190,7 +190,8 @@
Apsauga nuo žiniatinklio sekimo
Apsauga nuo žiniatinklio sekimo
- Žiniatinklio sekimo apsauga įjungta
+ Žiniatinklio sekimo apsauga įjungta
+ Apsauga nuo žiniatinklio sekimo
Sužinokite daugiau]]>
Sužinoti daugiau]]>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 8d4a23d32822..85a33dc0fd8c 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -125,7 +125,7 @@
Iestatījumi
Iestatījumi
Privātums
- Privātuma aizsardzība
+ Aizsardzība
Izskats
Pielāgošana
Par
@@ -158,14 +158,14 @@
Tīmekļa izsekošanas aizsardzība
Iespējots pēc noklusējuma
Iestatījumi
- Galvenie iestatījumi
+ Citi iestatījumi
Atļaujas
Sinhronizācija un dublēšana
Fire Button
Datu notīrīšana
Pievienot logrīku sākuma ekrānam
Iestati adreses joslas pozīciju
- Iespējot balss meklēšanu
+ Iespējo privātu balss meklēšanu
DuckDuckGo citās platformās
@@ -190,7 +190,8 @@
Tīmekļa izsekošanas aizsardzība
Tīmekļa izsekošanas aizsardzība
- Ir iespējota tīmekļa izsekošanas aizsardzība
+ Ir iespējota tīmekļa izsekošanas aizsardzība
+ Tīmekļa izsekošanas aizsardzība
Uzzināt vairāk]]>
Uzzināt vairāk]]>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 3fe9aa5dfe7f..1eb0aa4a1ce0 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -125,7 +125,7 @@
Innstillinger
Innstillinger
Personvern
- Personvern
+ Beskyttelser
Utseende
Tilpass
Om
@@ -158,14 +158,14 @@
Beskyttelse mot nettsporing
Aktivert som standard
Innstillinger
- Hovedinnstillinger
+ Andre innstillinger
Tillatelser
Synkronisering og sikkerhetskopiering
Fire Button
Sletting av data
Legg til widgeten på startskjermen
Angi plassering av adressefeltet
- Aktiver talesøk
+ Aktiver privat talesøk
DuckDuckGo på andre plattformer
@@ -190,7 +190,8 @@
Beskyttelse mot nettsporing
Beskyttelse mot nettsporing
- Nettsporingsbeskyttelse er aktivert
+ Nettsporingsbeskyttelse er aktivert
+ Beskyttelse mot nettsporing
Finn ut mer]]>
Finn ut mer]]>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 50d5b1e30e8b..3265494ee3e7 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -125,7 +125,7 @@
Instellingen
Instellingen
Privacy
- Privacybescherming
+ Bescherming
Uiterlijk
Aanpassen
Over
@@ -158,14 +158,14 @@
Bescherming tegen webtracking
Standaard ingeschakeld
Instellingen
- Hoofdinstellingen
+ Overige Instellingen
Toestemmingen
Synchronisatie en back-up
Fire Button
Gegevens wissen
Widget toevoegen aan startscherm
Positie van adresbalk instellen
- Zoeken via spraak inschakelen
+ Privé voice search inschakelen
DuckDuckGo op andere platforms
@@ -190,7 +190,8 @@
Bescherming tegen webtracking
Bescherming tegen webtracking
- Bescherming tegen webtracking is ingeschakeld
+ Bescherming tegen webtracking is ingeschakeld
+ Bescherming tegen webtracking
Meer informatie]]>
Meer informatie]]>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 0763bdda5bd8..6bc444f70a1d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -125,7 +125,7 @@
Ustawienia
Ustawienia
Prywatność
- Mechanizmy Ochrony Prywatności
+ Ochrona
Wygląd
Spersonalizuj
Informacje
@@ -158,14 +158,14 @@
Ochrona przed śledzeniem w sieci
Domyślnie włączone
Ustawienia
- Ustawienia główne
+ Inne ustawienia
Uprawnienia
Synchronizacja i kopia zapasowa
Przycisk zabezpieczenia
Czyszczenie danych
Dodaj widżet do ekranu głównego
Ustaw pozycję paska adresu
- Włącz wyszukiwanie głosowe
+ Włącz prywatne wyszukiwanie głosowe
DuckDuckGo na innych platformach
@@ -190,7 +190,8 @@
Ochrona przed śledzeniem w sieci
Ochrona przed śledzeniem w sieci
- Ochrona przed śledzeniem w sieci jest włączona
+ Ochrona przed śledzeniem w sieci jest włączona
+ Ochrona przed śledzeniem w sieci
Dowiedz się więcej]]>
Dowiedz się więcej]]>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index dda8d508af00..1a5bb2336ff4 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -125,7 +125,7 @@
Definições
Definições
Privacidade
- Proteções de Privacidade
+ Proteções
Aparência
Personalizar
Acerca de
@@ -158,14 +158,14 @@
Proteção contra rastreamento na internet
Ativado por predefinição
Definições
- Definições Principais
+ Outros ajustes
Permissões
Sincronização e cópia de segurança
Botão de proteção
Limpeza de Dados
Adicionar widget ao ecrã inicial
Define a Posição da Barra de Endereços
- Ativar Pesquisa por Voz
+ Ativar pesquisa por voz privada
DuckDuckGo Noutras Plataformas
@@ -190,7 +190,8 @@
Proteção contra rastreamento na internet
Proteção contra rastreamento na internet
- A proteção contra rastreamento na Internet está ativada
+ A proteção contra rastreamento na Internet está ativada
+ Proteção contra rastreamento na internet
Sabe mais]]>
Sabe mais]]>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index d1cf1b911445..ee07fe22b881 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -125,7 +125,7 @@
Setări
Setări
Confidențialitate
- Măsuri de protecție a confidențialității
+ Protecții
Aspect
Personalizare
Despre
@@ -158,14 +158,14 @@
Protecție împotriva urmăririi pe web
Activat în mod implicit
Setări
- Setări principale
+ Alte Setări
Permisiuni
Sincronizare și copiere de rezervă
Butonul Foc
Ștergerea datelor
Adaugă un widget la ecranul de întâmpinare
Setează poziția barei de adrese
- Activează căutarea vocală
+ Activează căutarea vocală privată
DuckDuckGo pe alte platforme
@@ -190,7 +190,8 @@
Protecție împotriva urmăririi pe web
Protecție împotriva urmăririi pe web
- Protecția împotriva urmăririi pe web este activată
+ Protecția împotriva urmăririi pe web este activată
+ Protecție împotriva urmăririi pe web
Află mai multe]]>
Află mai multe]]>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 01d4c3022e88..12eb0a6f5b69 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -125,7 +125,7 @@
Настройки
Настройки
Конфиденциальность
- Защита конфиденциальности
+ Средства защиты
Внешний вид
Собственная настройка
О нас
@@ -158,14 +158,14 @@
Защита от отслеживания онлайн
Включено по умолчанию
Настройки
- Основные настройки
+ Прочие настройки
Разрешения
Синхронизация и резервное копирование
Кнопка «Тревога»
Очистка данных
Добавьте виджет на домашний экран
Настроить положение адресной строки
- Включить голосовой поиск
+ Включить конфиденциальный голосовой поиск
DuckDuckGo для других платформ
@@ -190,7 +190,8 @@
Защита от отслеживания онлайн
Защита от отслеживания онлайн
- Включена защита от отслеживания онлайн
+ Включена защита от отслеживания онлайн
+ Защита от отслеживания онлайн
Подробнее...]]>
Подробнее...]]>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 4299561c9d6c..6eeee7282bd4 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -125,7 +125,7 @@
Nastavenia
Nastavenia
Súkromie
- Ochrana súkromia
+ Ochrany
Vzhľad
Prispôsobiť
O
@@ -158,14 +158,14 @@
Ochrana pred sledovaním webu
Predvolene povolené
Nastavenia
- Hlavné nastavenia
+ Ďalšie nastavenia
Oprávnenia
Synchronizácia a zálohovanie
Tlačidlo Fire
Vymazanie údajov
Pridať miniaplikáciu na domovskú obrazovku
Nastavenie polohy panela s adresou
- Povoliť hlasové vyhľadávanie
+ Povoliť súkromné hlasové vyhľadávanie
DuckDuckGo na iných platformách
@@ -190,7 +190,8 @@
Ochrana pred sledovaním webu
Ochrana pred sledovaním webu
- Ochrana pred sledovaním webu je povolená
+ Ochrana pred sledovaním webu je povolená
+ Ochrana pred sledovaním webu
Zistiť viac]]>
Zisti viac]]>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index 319455a81a48..cea7e0bf534d 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -125,7 +125,7 @@
Nastavitve
Nastavitve
Zasebnost
- Zaščita zasebnosti
+ Zaščite
Izgled
Prilagodi
O nas
@@ -158,14 +158,14 @@
Zaščita pred spletnim sledenjem
Privzeto omogočeno
Nastavitve
- Glavne nastavitve
+ Druge nastavitve
Dovoljenja
Sinhronizacija in varnostno kopiranje
Gumb Fire Button
Počiščenje podatkov
Dodajte pripomoček na domači zaslon
Nastavitev položaja naslovne vrstice
- Omogočanje glasovnega iskanja
+ Omogoči zasebno glasovno iskanje
DuckDuckGo na drugih platformah
@@ -190,7 +190,8 @@
Zaščita pred spletnim sledenjem
Zaščita pred spletnim sledenjem
- Zaščita spletnega sledenja je omogočena
+ Zaščita spletnega sledenja je omogočena
+ Zaščita pred spletnim sledenjem
Več o tem]]>
Več o tem]]>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 767c19da9fab..6485e919613f 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -125,7 +125,7 @@
Inställningar
Inställningar
Sekretess
- Integritetsskydd
+ Skydd
Utseende
Anpassa
Om
@@ -158,14 +158,14 @@
Web Tracking Protection
Aktiverat som standard
Inställningar
- Huvudinställningar
+ Andra inställningar
Behörigheter
Synkronisering och säkerhetskopiering
Fire Button
Datarensning
Lägg till widget på startsidan
Ange din adressfältsposition
- Aktivera röstsökning
+ Aktivera privat röstsökning
DuckDuckGo på andra plattformar
@@ -190,7 +190,8 @@
Web Tracking Protection
Web Tracking Protection
- Skydd för webbspårning är aktiverat
+ Skydd för webbspårning är aktiverat
+ Web Tracking Protection
Mer information]]>
Läs mer]]>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 0e53f06855c7..e05aa63b816c 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -125,7 +125,7 @@
Ayarlar
Ayarlar
Gizlilik
- Gizlilik Korumaları
+ Korumalar
Görünüm
Özelleştir
Hakkında
@@ -158,14 +158,14 @@
Web İzleme Koruması
Varsayılan olarak etkinleştirildi
Ayarlar
- Ana Ayarlar
+ Diğer Ayarlar
İzinler
Senkronizasyon ve Yedekleme
Fire Button
Veri Temizleme
Widget\'ı Ana Ekrana Ekle
Adres Çubuğu Konumunuzu Ayarlayın
- Sesli Arama\'yı Etkinleştir
+ Özel Sesli Aramayı Etkinleştir
Diğer Platformlarda DuckDuckGo
@@ -190,7 +190,8 @@
Web İzleme Koruması
Web İzleme Koruması
- Web İzleme Engelleyici Etkinleştirildi
+ Web İzleme Engelleyici Etkinleştirildi
+ Web İzleme Koruması
Daha fazla bilgi edin]]>
Daha Fazla Bilgi]]>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4312819e041d..a52d3aef5528 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -124,7 +124,7 @@
Settings
Settings
Privacy
- Privacy Protections
+ Protections
Appearance
Customize
About
@@ -157,14 +157,14 @@
Web Tracking Protection
Enabled by default
Settings
- Main Settings
+ Other Settings
Permissions
Sync & Backup
Fire Button
Data Clearing
- Add Widget to HomeScreen
+ Add Widget to Home Screen
Set Your Address Bar Position
- Enable Voice Search
+ Enable Private Voice Search
DuckDuckGo on Other Platforms
@@ -189,7 +189,8 @@
Web Tracking Protection
Web Tracking Protection
- Web Tracking Protection is Enabled
+ Web Tracking Protection is Enabled
+ Web Tracking Protection
Learn More]]>
Learn More]]>
diff --git a/autoconsent/autoconsent-impl/src/main/java/com/duckduckgo/autoconsent/impl/ui/AutoconsentSettingsActivity.kt b/autoconsent/autoconsent-impl/src/main/java/com/duckduckgo/autoconsent/impl/ui/AutoconsentSettingsActivity.kt
index 09ae7b3beff5..b7c16de793ef 100644
--- a/autoconsent/autoconsent-impl/src/main/java/com/duckduckgo/autoconsent/impl/ui/AutoconsentSettingsActivity.kt
+++ b/autoconsent/autoconsent-impl/src/main/java/com/duckduckgo/autoconsent/impl/ui/AutoconsentSettingsActivity.kt
@@ -27,7 +27,6 @@ import android.text.style.ClickableSpan
import android.text.style.URLSpan
import android.view.View
import android.widget.CompoundButton
-import androidx.core.content.ContextCompat
import androidx.core.view.isGone
import androidx.core.view.isVisible
import androidx.lifecycle.Lifecycle
@@ -40,6 +39,7 @@ import com.duckduckgo.autoconsent.impl.ui.AutoconsentSettingsViewModel.Command
import com.duckduckgo.autoconsent.impl.ui.AutoconsentSettingsViewModel.ViewState
import com.duckduckgo.browser.api.ui.BrowserScreens.WebViewActivityWithParams
import com.duckduckgo.common.ui.DuckDuckGoActivity
+import com.duckduckgo.common.ui.view.getColorFromAttr
import com.duckduckgo.common.ui.viewbinding.viewBinding
import com.duckduckgo.common.utils.extensions.html
import com.duckduckgo.di.scopes.ActivityScope
@@ -78,7 +78,7 @@ class AutoconsentSettingsActivity : DuckDuckGoActivity() {
override fun updateDrawState(ds: TextPaint) {
super.updateDrawState(ds)
if (newSettingsFeature.self().isEnabled()) {
- ds.color = ContextCompat.getColor(applicationContext, CommonR.color.blue50)
+ ds.color = getColorFromAttr(CommonR.attr.daxColorAccentBlue)
ds.isUnderlineText = false
}
}
@@ -124,7 +124,7 @@ class AutoconsentSettingsActivity : DuckDuckGoActivity() {
if (newSettingsFeature.self().isEnabled()) {
with(binding) {
autoconsentHeaderImage.setImageResource(
- if (viewState.autoconsentEnabled) R.drawable.cookie_popups_check_128 else R.drawable.cookie_popups_128,
+ if (viewState.autoconsentEnabled) R.drawable.cookie_popups_check_128 else R.drawable.cookie_block_128,
)
autoconsentStatusIndicator.setStatus(viewState.autoconsentEnabled)
}
diff --git a/autoconsent/autoconsent-impl/src/main/res/drawable/cookie_block_128.xml b/autoconsent/autoconsent-impl/src/main/res/drawable/cookie_block_128.xml
new file mode 100644
index 000000000000..25305a8232e9
--- /dev/null
+++ b/autoconsent/autoconsent-impl/src/main/res/drawable/cookie_block_128.xml
@@ -0,0 +1,45 @@
+
+
+
+
+
+
+
+
+
+
+
diff --git a/autoconsent/autoconsent-impl/src/main/res/drawable/cookie_popups_128.xml b/autoconsent/autoconsent-impl/src/main/res/drawable/cookie_popups_128.xml
deleted file mode 100644
index 9b346e4c3502..000000000000
--- a/autoconsent/autoconsent-impl/src/main/res/drawable/cookie_popups_128.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/themepreview/ui/component/ComponentViewHolder.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/themepreview/ui/component/ComponentViewHolder.kt
index 10816aec5641..732d600e2962 100644
--- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/themepreview/ui/component/ComponentViewHolder.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/themepreview/ui/component/ComponentViewHolder.kt
@@ -194,6 +194,11 @@ sealed class ComponentViewHolder(val view: View) : RecyclerView.ViewHolder(view)
setTrailingIconClickListener { Snackbar.make(view, "Overflow menu clicked", Snackbar.LENGTH_SHORT).show() }
}
+ view.findViewById(R.id.oneLineListItemWithTrailingIcon).apply {
+ setClickListener { Snackbar.make(this, component.name, Snackbar.LENGTH_SHORT).show() }
+ setTrailingIconClickListener { Snackbar.make(view, "Overflow menu clicked", Snackbar.LENGTH_SHORT).show() }
+ }
+
view.findViewById(R.id.oneLineListItemWithLeadingAndTrailingIcons).apply {
setClickListener { Snackbar.make(this, component.name, Snackbar.LENGTH_SHORT).show() }
setLeadingIconClickListener { Snackbar.make(view, "Leading Icon clicked", Snackbar.LENGTH_SHORT).show() }
diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/DaxListItem.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/DaxListItem.kt
index be3d7833aff4..af66b996a5c9 100644
--- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/DaxListItem.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/DaxListItem.kt
@@ -24,6 +24,7 @@ import android.util.AttributeSet
import android.view.View
import android.widget.CompoundButton.OnCheckedChangeListener
import android.widget.ImageView
+import androidx.annotation.ColorInt
import androidx.annotation.ColorRes
import androidx.annotation.DrawableRes
import androidx.constraintlayout.widget.ConstraintLayout
@@ -181,6 +182,10 @@ abstract class DaxListItem(
trailingIcon.contentDescription = description
}
+ fun setTrailingIconTint(@ColorInt color: Int) {
+ trailingIcon.imageTintList = ColorStateList.valueOf(color)
+ }
+
/** Sets the item overflow menu click listener */
fun setLeadingIconClickListener(onClick: (View) -> Unit) {
leadingIcon.setOnClickListener { onClick(leadingIcon) }
diff --git a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/OneLineListItem.kt b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/OneLineListItem.kt
index f26fc192ffc3..166d7638cb34 100644
--- a/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/OneLineListItem.kt
+++ b/common/common-ui/src/main/java/com/duckduckgo/common/ui/view/listitem/OneLineListItem.kt
@@ -21,6 +21,7 @@ import android.util.AttributeSet
import android.view.View
import android.widget.ImageView
import com.duckduckgo.common.ui.view.DaxSwitch
+import com.duckduckgo.common.ui.view.getColorFromAttr
import com.duckduckgo.common.ui.view.listitem.DaxListItem.IconSize.Medium
import com.duckduckgo.common.ui.view.text.DaxTextView
import com.duckduckgo.common.ui.viewbinding.viewBinding
@@ -107,6 +108,11 @@ class OneLineListItem @JvmOverloads constructor(
showSwitch -> showSwitch()
showTrailingIcon -> {
setTrailingIconDrawable(getDrawable(R.styleable.OneLineListItem_trailingIcon)!!)
+ if (hasValue(R.styleable.OneLineListItem_trailingIconTint)) {
+ val colorInt =
+ getColor(R.styleable.OneLineListItem_trailingIconTint, context.getColorFromAttr(R.attr.daxColorPrimaryIcon))
+ setTrailingIconTint(colorInt)
+ }
showTrailingIcon()
}
else -> {
diff --git a/common/common-ui/src/main/res/drawable/ic_default_browser_mobile_color_24.xml b/common/common-ui/src/main/res/drawable/ic_default_browser_mobile_color_24.xml
index aa545c377c5e..f5fe8862c58b 100644
--- a/common/common-ui/src/main/res/drawable/ic_default_browser_mobile_color_24.xml
+++ b/common/common-ui/src/main/res/drawable/ic_default_browser_mobile_color_24.xml
@@ -3,24 +3,24 @@
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/common/common-ui/src/main/res/layout/component_one_line_item.xml b/common/common-ui/src/main/res/layout/component_one_line_item.xml
index 96e40bb815f8..b4cc7af0d1b0 100644
--- a/common/common-ui/src/main/res/layout/component_one_line_item.xml
+++ b/common/common-ui/src/main/res/layout/component_one_line_item.xml
@@ -150,13 +150,25 @@
app:trailingIcon="@drawable/ic_menu_vertical_24" />
+
+
+ android:paddingHorizontal="@dimen/keyline_4"
+ android:paddingVertical="@dimen/keyline_2">
+
@@ -78,6 +79,7 @@
+
diff --git a/common/common-ui/src/main/res/values/design-system-colors.xml b/common/common-ui/src/main/res/values/design-system-colors.xml
index a192127925ed..e912fe80ddc8 100644
--- a/common/common-ui/src/main/res/values/design-system-colors.xml
+++ b/common/common-ui/src/main/res/values/design-system-colors.xml
@@ -34,6 +34,7 @@
daxColorSecondaryText - Secondary text color
daxColorSecondaryText - Secondary text color inverted
daxColorPrimaryIcon - Primary color for icons
+ daxColorSecondaryIcon - Secondary color for icons
daxColorDestructive - Destructive element (Destructive button)
daxColorLines - Dividers between elements
daxColorAccentBlue - Main accent color (Button primary)
@@ -53,6 +54,7 @@
+
diff --git a/common/common-ui/src/main/res/values/design-system-theming.xml b/common/common-ui/src/main/res/values/design-system-theming.xml
index 9e2bfe1b6887..f0d4885bc9f7 100644
--- a/common/common-ui/src/main/res/values/design-system-theming.xml
+++ b/common/common-ui/src/main/res/values/design-system-theming.xml
@@ -157,6 +157,7 @@
- @color/black60
- @color/white48
- @color/white84
+ - @color/white60
- @color/alertRedOnDarkDefault
- @color/white40
- @color/white18
@@ -246,6 +247,7 @@
- @color/white60
- @color/black48
- @color/black84
+ - @color/black60
- @color/black40
- @color/alertRedOnLightDefault
- @color/black6
diff --git a/subscriptions/subscriptions-impl/src/main/res/layout/activity_subscription_settings.xml b/subscriptions/subscriptions-impl/src/main/res/layout/activity_subscription_settings.xml
index 9fa3f01d66dc..20eaa691eb66 100644
--- a/subscriptions/subscriptions-impl/src/main/res/layout/activity_subscription_settings.xml
+++ b/subscriptions/subscriptions-impl/src/main/res/layout/activity_subscription_settings.xml
@@ -20,7 +20,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
- tools:context="com.duckduckgo.subscriptions.impl.ui.SubscriptionsActivity">
+ tools:context="com.duckduckgo.subscriptions.impl.ui.SubscriptionSettingsActivity">
+ app:typography="h2" />