From bb178dc25e0bf1c52c9a2519a353ca038fa933cd Mon Sep 17 00:00:00 2001 From: Jean-BaptisteC Date: Wed, 24 Jan 2024 21:35:07 +0100 Subject: [PATCH] Remove X link and reorganize links in app --- .../fragments/about/AboutFragment.kt | 35 +++++++-------- app/src/main/res/drawable/ic_x.xml | 11 ----- app/src/main/res/values-cn/strings.xml | 2 +- app/src/main/res/values-cs/strings.xml | 2 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-fr/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-pl/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values/strings.xml | 3 +- app/src/main/res/xml/about_preference.xml | 45 +++++++++---------- 13 files changed, 45 insertions(+), 67 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_x.xml diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt index 57d8b564..3d1ba667 100644 --- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt +++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/about/AboutFragment.kt @@ -36,7 +36,6 @@ class AboutFragment : PreferenceFragmentCompat() { private const val privacyPolicyURL = "https://exodus-privacy.eu.org/en/page/privacy-policy/" private const val sourceCodeURL = "https://github.com/Exodus-Privacy/exodus-android-app" private const val websiteURL = "https://exodus-privacy.eu.org/" - private const val twitterURL = "https://twitter.com/ExodusPrivacy" private const val mastodonURL = "https://mastodon.social/@exodus@framapiaf.org" private const val emailID = "contact@exodus-privacy.eu.org" } @@ -98,11 +97,6 @@ class AboutFragment : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.about_preference, rootKey) - findPreference("analyze")?.setOnPreferenceClickListener { - openURL(customTabsIntent, it.context, analyzeURL) - true - } - findPreference("alternatives")?.setOnPreferenceClickListener { openURL(customTabsIntent, it.context, alternativesURL) true @@ -112,20 +106,6 @@ class AboutFragment : PreferenceFragmentCompat() { openURL(customTabsIntent, it.context, getLocaleWebsiteURL()) true } - findPreference("privPolicy")?.setOnPreferenceClickListener { - openURL(customTabsIntent, it.context, privacyPolicyURL) - true - } - - findPreference("srcCode")?.setOnPreferenceClickListener { - openURL(customTabsIntent, it.context, sourceCodeURL) - true - } - - findPreference("X")?.setOnPreferenceClickListener { - openURL(customTabsIntent, it.context, twitterURL) - true - } findPreference("mastodon")?.setOnPreferenceClickListener { openURL(customTabsIntent, it.context, mastodonURL) @@ -142,6 +122,21 @@ class AboutFragment : PreferenceFragmentCompat() { false } } + + findPreference("analyze")?.setOnPreferenceClickListener { + openURL(customTabsIntent, it.context, analyzeURL) + true + } + + findPreference("privPolicy")?.setOnPreferenceClickListener { + openURL(customTabsIntent, it.context, privacyPolicyURL) + true + } + + findPreference("srcCode")?.setOnPreferenceClickListener { + openURL(customTabsIntent, it.context, sourceCodeURL) + true + } } override fun onDestroyView() { diff --git a/app/src/main/res/drawable/ic_x.xml b/app/src/main/res/drawable/ic_x.xml deleted file mode 100644 index e701f7e9..00000000 --- a/app/src/main/res/drawable/ic_x.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/app/src/main/res/values-cn/strings.xml b/app/src/main/res/values-cn/strings.xml index 7f909282..2c234700 100644 --- a/app/src/main/res/values-cn/strings.xml +++ b/app/src/main/res/values-cn/strings.xml @@ -42,7 +42,7 @@ 了解我们如何处理您的数据 电邮 通过电子邮件联系我们 - 了解 Exodus Privacy 项目动态 + 了解 Exodus Privacy 项目动态 在 Exodus Privacy 上打开 提交应用 diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 11b4e6fc..0a5ea416 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -42,7 +42,7 @@ Zjistěte, jak nakládáme s vašimi údaji E-Mail Kontaktujte nás e-mailem - Zůstaňte informováni o projektu Exodus Privacy + Zůstaňte informováni o projektu Exodus Privacy Otevřeno v Exodus Privacy Odeslat aplikaci diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index dcb9f3dc..ac8abb4d 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -44,7 +44,7 @@ Erfahren Sie, wie wir mit Ihren Daten umgehen Mail Erreiche uns per E-Mail - Bleiben Sie mit dem Exodus Privatsphäre-Projekt auf dem Laufenden + Bleiben Sie mit dem Exodus Privatsphäre-Projekt auf dem Laufenden Exodus Privatsphäre Regelungen öffnen diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 55a928a8..dd004616 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -46,7 +46,7 @@ Comment nous traitons vos données Mail Contactez-nous par mail - S\'informer de notre actualité + S\'informer de notre actualité Ouvrir sur Exodus Privacy diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 0ac584e5..3f51d3ce 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -42,7 +42,7 @@ Ismerje meg, hogyan kezeljük az adatait E-mail Lépjen kapcsolatba velünk e-mailben - Legyen naprakész az Exodus Privacy projekttel kapcsolatban + Legyen naprakész az Exodus Privacy projekttel kapcsolatban Nyissa meg az Exodus Privacyt Alkalmazás beküldése diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 41a57534..8e69dbd0 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -46,7 +46,7 @@ Scopri come gestiamo i tuoi dati E-mail Contattaci tramite E-Mail - Rimani aggiornato sul progetto Exodus Privacy + Rimani aggiornato sul progetto Exodus Privacy Apri su Exodus Privacy diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0408ef46..2db93378 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -47,7 +47,7 @@ Dowiedz się, jak obsługujemy Twoje dane E-mail Skontaktuj się z nami przez e-mail - Bądź na bieżąco z projektem Exodus Privacy + Bądź na bieżąco z projektem Exodus Privacy Otwórz na prywatności Exodus diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 8ff73202..ac3a030f 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -46,7 +46,7 @@ Узнайте, как мы обрабатываем ваши данные Почта Свяжитесь с нами по электронной почте - Будьте в курсе событий проекта Exodus Privacy + Будьте в курсе событий проекта Exodus Privacy Открыть на Exodus Privacy diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index 4e4ed830..fe6f5e4c 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -46,7 +46,7 @@ Verilerinizi nasıl işlediğimizi öğrenin Posta Bize e-posta ile ulaşın - Exodus Privacy projesindeki son gelişmelerden haberdar olun + Exodus Privacy projesindeki son gelişmelerden haberdar olun Exodus Privacy\'de aç diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 367c256c..2da718c1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -53,9 +53,8 @@ Learn how we handle your data Mail Reach out to us via email - Twitter Mastodon - Stay updated on Exodus Privacy project + Stay updated on Exodus Privacy project Open on Exodus Privacy diff --git a/app/src/main/res/xml/about_preference.xml b/app/src/main/res/xml/about_preference.xml index 2ac6ab01..8638a1e5 100644 --- a/app/src/main/res/xml/about_preference.xml +++ b/app/src/main/res/xml/about_preference.xml @@ -1,20 +1,30 @@ + + + + - - - - -