From b06c24402b5d32527c8449f8a5bd02ddfd15736a Mon Sep 17 00:00:00 2001 From: Alex Ning Date: Thu, 20 Feb 2020 15:43:53 +0800 Subject: Add a F-Droid option in settings. --- .../Settings/AboutPreferenceFragment.java | 16 +++++++++++++--- .../infinityforreddit/Utils/SharedPreferencesUtils.java | 1 + app/src/main/res/values/strings.xml | 2 ++ app/src/main/res/xml/about_preferences.xml | 5 +++++ 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AboutPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AboutPreferenceFragment.java index 0a0bd3bf..3d81bb30 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AboutPreferenceFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AboutPreferenceFragment.java @@ -28,7 +28,8 @@ public class AboutPreferenceFragment extends PreferenceFragmentCompat { setPreferencesFromResource(R.xml.about_preferences, rootKey); Preference openSourcePreference = findPreference(SharedPreferencesUtils.OPEN_SOURCE_KEY); - Preference reviewPreference = findPreference(SharedPreferencesUtils.RATE_KEY); + Preference ratePreference = findPreference(SharedPreferencesUtils.RATE_KEY); + Preference fDroidPreference = findPreference(SharedPreferencesUtils.F_DROID_KEY); Preference emailPreference = findPreference(SharedPreferencesUtils.EMAIL_KEY); Preference redditAccountPreference = findPreference(SharedPreferencesUtils.REDDIT_ACCOUNT_KEY); Preference subredditPreference = findPreference(SharedPreferencesUtils.SUBREDDIT_KEY); @@ -43,8 +44,8 @@ public class AboutPreferenceFragment extends PreferenceFragmentCompat { }); } - if (reviewPreference != null) { - reviewPreference.setOnPreferenceClickListener(preference -> { + if (ratePreference != null) { + ratePreference.setOnPreferenceClickListener(preference -> { Intent playStoreIntent = new Intent(Intent.ACTION_VIEW); playStoreIntent.setData(Uri.parse("market://details?id=ml.docilealligator.infinityforreddit")); if (playStoreIntent.resolveActivity(activity.getPackageManager()) != null) { @@ -58,6 +59,15 @@ public class AboutPreferenceFragment extends PreferenceFragmentCompat { }); } + if (fDroidPreference != null) { + fDroidPreference.setOnPreferenceClickListener(preference -> { + Intent intent = new Intent(activity, LinkResolverActivity.class); + intent.setData(Uri.parse("https://www.reddit.com/r/Infinity_For_Reddit/comments/f23o0y/for_anyone_who_wants_to_use_fdroid/")); + startActivity(intent); + return true; + }); + } + if (emailPreference != null) { emailPreference.setOnPreferenceClickListener(preference -> { Intent intent = new Intent(Intent.ACTION_SENDTO); diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java index 357ee2a5..85c1f9f9 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Utils/SharedPreferencesUtils.java @@ -21,6 +21,7 @@ public class SharedPreferencesUtils { public static final String MATERIAL_ICONS_KEY = "material_icons"; public static final String OPEN_SOURCE_KEY = "open_source"; public static final String RATE_KEY = "rate"; + public static final String F_DROID_KEY = "f-droid"; public static final String EMAIL_KEY = "email"; public static final String REDDIT_ACCOUNT_KEY = "reddit_account"; public static final String SUBREDDIT_KEY = "subreddit"; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ebc48af0..636c71e1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -344,6 +344,8 @@ Star it on Github if you like this app Rate in Google Play Give me a 5-star rating and I will be really happy + F-Droid + It\'s available in IzzyOnDroid, an F-Droid Repository Email docilealligator.app@gmail.com Reddit Account diff --git a/app/src/main/res/xml/about_preferences.xml b/app/src/main/res/xml/about_preferences.xml index 82898326..2772f2ed 100644 --- a/app/src/main/res/xml/about_preferences.xml +++ b/app/src/main/res/xml/about_preferences.xml @@ -20,6 +20,11 @@ app:title="@string/settings_rate_title" app:summary="@string/settings_rate_summary" /> + +