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 3e0d5226..3210e371 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 @@ -102,7 +102,7 @@ class AboutFragment : PreferenceFragmentCompat() { true } - findPreference("twitter")?.setOnPreferenceClickListener { + findPreference("X")?.setOnPreferenceClickListener { customTabsIntent.launchUrl(it.context, Uri.parse(twitterURL)) true } diff --git a/app/src/main/res/drawable/ic_back.xml b/app/src/main/res/drawable/ic_back.xml index cd06f309..93ae7bbd 100644 --- a/app/src/main/res/drawable/ic_back.xml +++ b/app/src/main/res/drawable/ic_back.xml @@ -7,5 +7,5 @@ android:viewportHeight="24"> + android:pathData="M19,11H7.83l4.88,-4.88c0.39,-0.39 0.39,-1.03 0,-1.42 -0.39,-0.39 -1.02,-0.39 -1.41,0l-6.59,6.59c-0.39,0.39 -0.39,1.02 0,1.41l6.59,6.59c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L7.83,13H19c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1z" /> diff --git a/app/src/main/res/drawable/ic_baseline_navigate_next_24.xml b/app/src/main/res/drawable/ic_baseline_navigate_next_24.xml deleted file mode 100644 index d6dc1ff8..00000000 --- a/app/src/main/res/drawable/ic_baseline_navigate_next_24.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_down.xml b/app/src/main/res/drawable/ic_down.xml index 68fd4058..35b66060 100644 --- a/app/src/main/res/drawable/ic_down.xml +++ b/app/src/main/res/drawable/ic_down.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M8.12,9.29L12,13.17l3.88,-3.88c0.39,-0.39 1.02,-0.39 1.41,0 0.39,0.39 0.39,1.02 0,1.41l-4.59,4.59c-0.39,0.39 -1.02,0.39 -1.41,0L6.7,10.7c-0.39,-0.39 -0.39,-1.02 0,-1.41 0.39,-0.38 1.03,-0.39 1.42,0z" /> diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml index d96c7521..d5663b4d 100644 --- a/app/src/main/res/drawable/ic_email.xml +++ b/app/src/main/res/drawable/ic_email.xml @@ -7,5 +7,5 @@ android:viewportHeight="24"> + android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM19.6,8.25l-7.07,4.42c-0.32,0.2 -0.74,0.2 -1.06,0L4.4,8.25c-0.25,-0.16 -0.4,-0.43 -0.4,-0.72 0,-0.67 0.73,-1.07 1.3,-0.72L12,11l6.7,-4.19c0.57,-0.35 1.3,0.05 1.3,0.72 0,0.29 -0.15,0.56 -0.4,0.72z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_filter_list_24.xml b/app/src/main/res/drawable/ic_filter.xml similarity index 51% rename from app/src/main/res/drawable/ic_baseline_filter_list_24.xml rename to app/src/main/res/drawable/ic_filter.xml index 52d95909..66ea2459 100644 --- a/app/src/main/res/drawable/ic_baseline_filter_list_24.xml +++ b/app/src/main/res/drawable/ic_filter.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M11,18h2c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-2c-0.55,0 -1,0.45 -1,1s0.45,1 1,1zM3,7c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L4,6c-0.55,0 -1,0.45 -1,1zM7,13h10c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1L7,11c-0.55,0 -1,0.45 -1,1s0.45,1 1,1z" /> diff --git a/app/src/main/res/drawable/ic_forward.xml b/app/src/main/res/drawable/ic_forward.xml index c043d7bf..67177b91 100644 --- a/app/src/main/res/drawable/ic_forward.xml +++ b/app/src/main/res/drawable/ic_forward.xml @@ -7,5 +7,5 @@ android:viewportHeight="24"> + android:pathData="M9.31,6.71c-0.39,0.39 -0.39,1.02 0,1.41L13.19,12l-3.88,3.88c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0l4.59,-4.59c0.39,-0.39 0.39,-1.02 0,-1.41L10.72,6.7c-0.38,-0.38 -1.02,-0.38 -1.41,0.01z" /> diff --git a/app/src/main/res/drawable/ic_mastodon.xml b/app/src/main/res/drawable/ic_mastodon.xml index aa5c5ce8..ee742476 100644 --- a/app/src/main/res/drawable/ic_mastodon.xml +++ b/app/src/main/res/drawable/ic_mastodon.xml @@ -6,7 +6,7 @@ android:viewportWidth="74" android:viewportHeight="79"> diff --git a/app/src/main/res/drawable/ic_match.xml b/app/src/main/res/drawable/ic_match.xml index 3b0e252d..21fa0b82 100644 --- a/app/src/main/res/drawable/ic_match.xml +++ b/app/src/main/res/drawable/ic_match.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M9,16.17L5.53,12.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.18,4.18c0.39,0.39 1.02,0.39 1.41,0L20.29,7.71c0.39,-0.39 0.39,-1.02 0,-1.41 -0.39,-0.39 -1.02,-0.39 -1.41,0L9,16.17z" /> diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index aefdcef5..33425552 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -5,5 +5,5 @@ android:viewportHeight="24"> + android:pathData="M15.5,14h-0.79l-0.28,-0.27c1.2,-1.4 1.82,-3.31 1.48,-5.34 -0.47,-2.78 -2.79,-5 -5.59,-5.34 -4.23,-0.52 -7.79,3.04 -7.27,7.27 0.34,2.8 2.56,5.12 5.34,5.59 2.03,0.34 3.94,-0.28 5.34,-1.48l0.27,0.28v0.79l4.25,4.25c0.41,0.41 1.08,0.41 1.49,0 0.41,-0.41 0.41,-1.08 0,-1.49L15.5,14zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z" /> diff --git a/app/src/main/res/drawable/ic_tracker.xml b/app/src/main/res/drawable/ic_tracker.xml index 203bd254..efe7c38c 100644 --- a/app/src/main/res/drawable/ic_tracker.xml +++ b/app/src/main/res/drawable/ic_tracker.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M12,6.5c3.79,0 7.17,2.13 8.82,5.5 -1.65,3.37 -5.02,5.5 -8.82,5.5S4.83,15.37 3.18,12C4.83,8.63 8.21,6.5 12,6.5m0,-2C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,9.5c1.38,0 2.5,1.12 2.5,2.5s-1.12,2.5 -2.5,2.5 -2.5,-1.12 -2.5,-2.5 1.12,-2.5 2.5,-2.5m0,-2c-2.48,0 -4.5,2.02 -4.5,4.5s2.02,4.5 4.5,4.5 4.5,-2.02 4.5,-4.5 -2.02,-4.5 -4.5,-4.5z" /> diff --git a/app/src/main/res/drawable/ic_tracker_filled.xml b/app/src/main/res/drawable/ic_tracker_filled.xml index c5af360f..cc9f66f1 100644 --- a/app/src/main/res/drawable/ic_tracker_filled.xml +++ b/app/src/main/res/drawable/ic_tracker_filled.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z" /> diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter.xml deleted file mode 100644 index 64697ea0..00000000 --- a/app/src/main/res/drawable/ic_twitter.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_unavailable.xml b/app/src/main/res/drawable/ic_unavailable.xml index d5d2297a..3ee7f93f 100644 --- a/app/src/main/res/drawable/ic_unavailable.xml +++ b/app/src/main/res/drawable/ic_unavailable.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M18.3,5.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L12,10.59 7.11,5.7c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41L10.59,12 5.7,16.89c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.39 1.02,0.39 1.41,0L12,13.41l4.89,4.89c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L13.41,12l4.89,-4.89c0.38,-0.38 0.38,-1.02 0,-1.4z" /> diff --git a/app/src/main/res/drawable/ic_up.xml b/app/src/main/res/drawable/ic_up.xml index ef2e9825..fa22c69f 100644 --- a/app/src/main/res/drawable/ic_up.xml +++ b/app/src/main/res/drawable/ic_up.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M8.12,14.71L12,10.83l3.88,3.88c0.39,0.39 1.02,0.39 1.41,0 0.39,-0.39 0.39,-1.02 0,-1.41L12.7,8.71c-0.39,-0.39 -1.02,-0.39 -1.41,0L6.7,13.3c-0.39,0.39 -0.39,1.02 0,1.41 0.39,0.38 1.03,0.39 1.42,0z" /> diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 99e4d832..6dc2a877 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M11,8.75v3.68c0,0.35 0.19,0.68 0.49,0.86l3.12,1.85c0.36,0.21 0.82,0.09 1.03,-0.26c0.21,-0.36 0.1,-0.82 -0.26,-1.03l-2.87,-1.71v-3.4C12.5,8.34 12.16,8 11.75,8S11,8.34 11,8.75zM21,9.5V4.21c0,-0.45 -0.54,-0.67 -0.85,-0.35l-1.78,1.78c-1.81,-1.81 -4.39,-2.85 -7.21,-2.6c-4.19,0.38 -7.64,3.75 -8.1,7.94C2.46,16.4 6.69,21 12,21c4.59,0 8.38,-3.44 8.93,-7.88c0.07,-0.6 -0.4,-1.12 -1,-1.12c-0.5,0 -0.92,0.37 -0.98,0.86c-0.43,3.49 -3.44,6.19 -7.05,6.14c-3.71,-0.05 -6.84,-3.18 -6.9,-6.9C4.94,8.2 8.11,5 12,5c1.93,0 3.68,0.79 4.95,2.05l-2.09,2.09C14.54,9.46 14.76,10 15.21,10h5.29C20.78,10 21,9.78 21,9.5z" /> diff --git a/app/src/main/res/drawable/ic_x.xml b/app/src/main/res/drawable/ic_x.xml new file mode 100644 index 00000000..5b8588ff --- /dev/null +++ b/app/src/main/res/drawable/ic_x.xml @@ -0,0 +1,11 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/apps_menu.xml b/app/src/main/res/menu/apps_menu.xml index f0d30fd5..24c3bdb6 100644 --- a/app/src/main/res/menu/apps_menu.xml +++ b/app/src/main/res/menu/apps_menu.xml @@ -12,7 +12,7 @@ diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6eb63e70..cef8da0d 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -45,7 +45,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-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index a2f03f6f..5b95c910 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -45,7 +45,7 @@ Dowiedz się, jak postępujemy z Twoimi danymi Email 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 w Exodus Privacy diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ea932239..1c2aca74 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -33,7 +33,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ç Uygulamayı gönder Mağazayı aç diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 56189568..8ac2740d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,9 +52,9 @@ Learn how we handle your data Mail Reach out to us via email - Twitter + 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 77d4a02f..2ac6ab01 100644 --- a/app/src/main/res/xml/about_preference.xml +++ b/app/src/main/res/xml/about_preference.xml @@ -33,11 +33,11 @@ + android:icon="@drawable/ic_x" + android:key="X" + android:summary="@string/X_desc" + android:title="@string/X" />