diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/ItemDonate.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/ItemDonate.java index 9714a2fb..91f0171b 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/ItemDonate.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/ItemDonate.java @@ -13,18 +13,26 @@ import io.github.sspanak.tt9.util.Logger; class ItemDonate extends ItemClickable { static final String NAME = "donate_link"; private final PreferencesActivity activity; + private final boolean isVisible; - ItemDonate(Preference preference, PreferencesActivity activity) { + ItemDonate(Preference preference, PreferencesActivity activity, boolean isTT9On) { super(preference); this.activity = activity; + this.isVisible = false; } public ItemDonate populate() { - if (item != null) { + if (item == null) { + return this; + } + + if (isVisible) { String appName = activity.getString(R.string.app_name_short); String url = activity.getString(R.string.donate_url_short); item.setSummary(activity.getString(R.string.donate_summary, appName, url)); } + item.setVisible(isVisible); + return this; } diff --git a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/MainSettingsScreen.java b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/MainSettingsScreen.java index 0a889294..c7ab33be 100644 --- a/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/MainSettingsScreen.java +++ b/app/src/main/java/io/github/sspanak/tt9/preferences/screens/main/MainSettingsScreen.java @@ -24,8 +24,9 @@ public class MainSettingsScreen extends BaseScreenFragment { @Override public void onCreate() { - createSettingsSection(); - createAboutSection(); + boolean isTT9On = SystemSettings.isTT9Enabled(activity); + createSettingsSection(isTT9On); + createAboutSection(isTT9On); updateHelpButtonDescription(); resetFontSize(false); } @@ -35,13 +36,16 @@ public class MainSettingsScreen extends BaseScreenFragment { public void onResume() { init(); // changing the theme recreates the PreferencesActivity, making "this.activity" NULL, so we reinitialize it. super.onResume(); - createSettingsSection(); + + boolean isTT9On = SystemSettings.isTT9Enabled(activity); + createSettingsSection(isTT9On); + createAboutSection(isTT9On); resetFontSize(false); } - private void createAboutSection() { - (new ItemDonate(findPreference(ItemDonate.NAME), activity)).populate().enableClickHandler(); + private void createAboutSection(boolean isTT9On) { + (new ItemDonate(findPreference(ItemDonate.NAME), activity, isTT9On)).populate().enableClickHandler(); (new ItemVersionInfo(findPreference(ItemVersionInfo.NAME), activity)).populate().enableClickHandler(); } @@ -57,9 +61,7 @@ public class MainSettingsScreen extends BaseScreenFragment { } - private void createSettingsSection() { - boolean isTT9On = SystemSettings.isTT9Enabled(activity); - + private void createSettingsSection(boolean isTT9On) { Preference gotoSetup = findPreference("screen_setup"); if (gotoSetup != null) { gotoSetup.setSummary(isTT9On ? "" : activity.getString(R.string.setup_click_here_to_enable)); diff --git a/app/src/main/res/xml/prefs.xml b/app/src/main/res/xml/prefs.xml index 09fa3af5..d0d7647c 100644 --- a/app/src/main/res/xml/prefs.xml +++ b/app/src/main/res/xml/prefs.xml @@ -38,7 +38,8 @@ + app:title="@string/donate_title" + app:isPreferenceVisible="false" />