Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove Twitter link in app #387

Merged
merged 1 commit into from
Jan 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down Expand Up @@ -98,11 +97,6 @@ class AboutFragment : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.about_preference, rootKey)

findPreference<Preference>("analyze")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, analyzeURL)
true
}

findPreference<Preference>("alternatives")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, alternativesURL)
true
Expand All @@ -112,20 +106,6 @@ class AboutFragment : PreferenceFragmentCompat() {
openURL(customTabsIntent, it.context, getLocaleWebsiteURL())
true
}
findPreference<Preference>("privPolicy")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, privacyPolicyURL)
true
}

findPreference<Preference>("srcCode")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, sourceCodeURL)
true
}

findPreference<Preference>("X")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, twitterURL)
true
}

findPreference<Preference>("mastodon")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, mastodonURL)
Expand All @@ -142,6 +122,21 @@ class AboutFragment : PreferenceFragmentCompat() {
false
}
}

findPreference<Preference>("analyze")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, analyzeURL)
true
}

findPreference<Preference>("privPolicy")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, privacyPolicyURL)
true
}

findPreference<Preference>("srcCode")?.setOnPreferenceClickListener {
openURL(customTabsIntent, it.context, sourceCodeURL)
true
}
}

override fun onDestroyView() {
Expand Down
11 changes: 0 additions & 11 deletions app/src/main/res/drawable/ic_x.xml

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/res/values-cn/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<string name="privPolicy_desc">了解我们如何处理您的数据</string>
<string name="email">电邮</string>
<string name="email_desc">通过电子邮件联系我们</string>
<string name="X_desc">了解 Exodus Privacy 项目动态</string>
<string name="mastodon_desc">了解 Exodus Privacy 项目动态</string>
<!-- AppDetail Fragment -->
<string name="open_exodus_page">在 Exodus Privacy 上打开</string>
<string name="submit_app">提交应用</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-cs/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<string name="privPolicy_desc">Zjistěte, jak nakládáme s vašimi údaji</string>
<string name="email">E-Mail</string>
<string name="email_desc">Kontaktujte nás e-mailem</string>
<string name="X_desc">Zůstaňte informováni o projektu Exodus Privacy</string>
<string name="mastodon_desc">Zůstaňte informováni o projektu Exodus Privacy</string>
<!-- AppDetail Fragment -->
<string name="open_exodus_page">Otevřeno v Exodus Privacy</string>
<string name="submit_app">Odeslat aplikaci</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-de/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
<string name="privPolicy_desc">Erfahren Sie, wie wir mit Ihren Daten umgehen</string>
<string name="email">Mail</string>
<string name="email_desc">Erreiche uns per E-Mail</string>
<string name="X_desc">Bleiben Sie mit dem Exodus Privatsphäre-Projekt auf dem Laufenden</string>
<string name="mastodon_desc">Bleiben Sie mit dem Exodus Privatsphäre-Projekt auf dem Laufenden</string>

<!-- AppDetail Fragment -->
<string name="open_exodus_page">Exodus Privatsphäre Regelungen öffnen</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-fr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<string name="privPolicy_desc">Comment nous traitons vos données</string>
<string name="email">Mail</string>
<string name="email_desc">Contactez-nous par mail</string>
<string name="X_desc">S\'informer de notre actualité</string>
<string name="mastodon_desc">S\'informer de notre actualité</string>

<!-- AppDetail Fragment -->
<string name="open_exodus_page">Ouvrir sur Exodus Privacy</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-hu/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<string name="privPolicy_desc">Ismerje meg, hogyan kezeljük az adatait</string>
<string name="email">E-mail</string>
<string name="email_desc">Lépjen kapcsolatba velünk e-mailben</string>
<string name="X_desc">Legyen naprakész az Exodus Privacy projekttel kapcsolatban</string>
<string name="mastodon_desc">Legyen naprakész az Exodus Privacy projekttel kapcsolatban</string>
<!-- AppDetail Fragment -->
<string name="open_exodus_page">Nyissa meg az Exodus Privacyt</string>
<string name="submit_app">Alkalmazás beküldése</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-it/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<string name="privPolicy_desc">Scopri come gestiamo i tuoi dati</string>
<string name="email">E-mail</string>
<string name="email_desc">Contattaci tramite E-Mail</string>
<string name="X_desc">Rimani aggiornato sul progetto Exodus Privacy</string>
<string name="mastodon_desc">Rimani aggiornato sul progetto Exodus Privacy</string>

<!-- AppDetail Fragment -->
<string name="open_exodus_page">Apri su Exodus Privacy</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-pl/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<string name="privPolicy_desc">Dowiedz się, jak obsługujemy Twoje dane</string>
<string name="email">E-mail</string>
<string name="email_desc">Skontaktuj się z nami przez e-mail</string>
<string name="X_desc">Bądź na bieżąco z projektem Exodus Privacy</string>
<string name="mastodon_desc">Bądź na bieżąco z projektem Exodus Privacy</string>

<!-- AppDetail Fragment -->
<string name="open_exodus_page">Otwórz na prywatności Exodus</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<string name="privPolicy_desc">Узнайте, как мы обрабатываем ваши данные</string>
<string name="email">Почта</string>
<string name="email_desc">Свяжитесь с нами по электронной почте</string>
<string name="X_desc">Будьте в курсе событий проекта Exodus Privacy</string>
<string name="mastodon_desc">Будьте в курсе событий проекта Exodus Privacy</string>

<!-- AppDetail Fragment -->
<string name="open_exodus_page">Открыть на Exodus Privacy</string>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-tr/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<string name="privPolicy_desc">Verilerinizi nasıl işlediğimizi öğrenin</string>
<string name="email">Posta</string>
<string name="email_desc">Bize e-posta ile ulaşın</string>
<string name="X_desc">Exodus Privacy projesindeki son gelişmelerden haberdar olun</string>
<string name="mastodon_desc">Exodus Privacy projesindeki son gelişmelerden haberdar olun</string>

<!-- AppDetail Fragment -->
<string name="open_exodus_page">Exodus Privacy\'de aç</string>
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@
<string name="privPolicy_desc">Learn how we handle your data</string>
<string name="email">Mail</string>
<string name="email_desc">Reach out to us via email</string>
<string name="X" translatable="false">Twitter</string>
<string name="mastodon" translatable="false">Mastodon</string>
<string name="X_desc">Stay updated on Exodus Privacy project</string>
<string name="mastodon_desc">Stay updated on Exodus Privacy project</string>

<!-- AppDetail Fragment -->
<string name="open_exodus_page">Open on Exodus Privacy</string>
Expand Down
45 changes: 20 additions & 25 deletions app/src/main/res/xml/about_preference.xml
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<Preference
android:icon="@drawable/ic_link"
android:key="alternatives"
android:summary="@string/alternatives_desc"
android:title="@string/alternatives" />
<Preference
android:icon="@drawable/ic_website"
android:key="website"
android:summary="@string/website_desc"
android:title="@string/website" />
<Preference
android:icon="@drawable/ic_mastodon"
android:key="mastodon"
android:summary="@string/mastodon_desc"
android:title="@string/mastodon" />
<Preference
android:icon="@drawable/ic_email"
android:key="email"
android:summary="@string/email_desc"
android:title="@string/email" />
<Preference
android:icon="@drawable/ic_request"
android:key="analyze"
android:summary="@string/analyze_desc"
android:title="@string/submit_app" />
<Preference
android:icon="@drawable/ic_link"
android:key="alternatives"
android:summary="@string/alternatives_desc"
android:title="@string/alternatives" />
<Preference
android:icon="@drawable/ic_website"
android:key="website"
android:summary="@string/website_desc"
android:title="@string/website" />
<Preference
android:icon="@drawable/ic_spy"
android:key="privPolicy"
Expand All @@ -25,19 +35,4 @@
android:key="srcCode"
android:summary="@string/srcCode_desc"
android:title="@string/srcCode" />
<Preference
android:icon="@drawable/ic_email"
android:key="email"
android:summary="@string/email_desc"
android:title="@string/email" />
<Preference
android:icon="@drawable/ic_mastodon"
android:key="mastodon"
android:summary="@string/X_desc"
android:title="@string/mastodon" />
<Preference
android:icon="@drawable/ic_x"
android:key="X"
android:summary="@string/X_desc"
android:title="@string/X" />
</PreferenceScreen>