diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java index dd91b7e2a..ea8774358 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java @@ -17,7 +17,6 @@ import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.fragment.preferences.AutoDownloadPreferencesFragment; import de.danoeh.antennapod.fragment.preferences.GpodderPreferencesFragment; import de.danoeh.antennapod.fragment.preferences.ImportExportPreferencesFragment; -import de.danoeh.antennapod.fragment.preferences.IntegrationsPreferencesFragment; import de.danoeh.antennapod.fragment.preferences.MainPreferencesFragment; import de.danoeh.antennapod.fragment.preferences.NetworkPreferencesFragment; import de.danoeh.antennapod.fragment.preferences.PlaybackPreferencesFragment; @@ -54,8 +53,6 @@ public class PreferenceActivity extends AppCompatActivity implements SearchPrefe if (screen == R.xml.preferences_user_interface) { prefFragment = new UserInterfacePreferencesFragment(); - } else if (screen == R.xml.preferences_integrations) { - prefFragment = new IntegrationsPreferencesFragment(); } else if (screen == R.xml.preferences_network) { prefFragment = new NetworkPreferencesFragment(); } else if (screen == R.xml.preferences_storage) { @@ -86,8 +83,6 @@ public class PreferenceActivity extends AppCompatActivity implements SearchPrefe return R.string.import_export_pref; case R.xml.preferences_user_interface: return R.string.user_interface_label; - case R.xml.preferences_integrations: - return R.string.integrations_label; case R.xml.preferences_gpodder: return R.string.gpodnet_main_label; default: diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/IntegrationsPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/IntegrationsPreferencesFragment.java deleted file mode 100644 index 51f31eb92..000000000 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/IntegrationsPreferencesFragment.java +++ /dev/null @@ -1,29 +0,0 @@ -package de.danoeh.antennapod.fragment.preferences; - -import android.os.Bundle; -import androidx.preference.PreferenceFragmentCompat; -import de.danoeh.antennapod.R; -import de.danoeh.antennapod.activity.PreferenceActivity; - -public class IntegrationsPreferencesFragment extends PreferenceFragmentCompat { - private static final String PREF_SCREEN_GPODDER = "prefGpodderSettings"; - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - addPreferencesFromResource(R.xml.preferences_integrations); - setupIntegrationsScreen(); - } - - @Override - public void onStart() { - super.onStart(); - ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.integrations_label); - } - - private void setupIntegrationsScreen() { - findPreference(PREF_SCREEN_GPODDER).setOnPreferenceClickListener(preference -> { - ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_gpodder); - return true; - }); - } -} diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java index da82d4f8c..d9dd7c47d 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/preferences/MainPreferencesFragment.java @@ -17,7 +17,7 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { private static final String PREF_SCREEN_USER_INTERFACE = "prefScreenInterface"; private static final String PREF_SCREEN_PLAYBACK = "prefScreenPlayback"; private static final String PREF_SCREEN_NETWORK = "prefScreenNetwork"; - private static final String PREF_SCREEN_INTEGRATIONS = "prefScreenIntegrations"; + private static final String PREF_SCREEN_GPODDER = "prefScreenGpodder"; private static final String PREF_SCREEN_STORAGE = "prefScreenStorage"; private static final String PREF_FAQ = "prefFaq"; private static final String PREF_VIEW_MAILING_LIST = "prefViewMailingList"; @@ -51,8 +51,8 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_network); return true; }); - findPreference(PREF_SCREEN_INTEGRATIONS).setOnPreferenceClickListener(preference -> { - ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_integrations); + findPreference(PREF_SCREEN_GPODDER).setOnPreferenceClickListener(preference -> { + ((PreferenceActivity) getActivity()).openScreen(R.xml.preferences_gpodder); return true; }); findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference -> { @@ -89,7 +89,7 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { } private void setupSearch() { - SearchPreference searchPreference = (SearchPreference) findPreference("searchPreference"); + SearchPreference searchPreference = findPreference("searchPreference"); SearchConfiguration config = searchPreference.getSearchConfiguration(); config.setActivity((AppCompatActivity) getActivity()); config.setFragmentContainerViewId(R.id.content); @@ -111,7 +111,6 @@ public class MainPreferencesFragment extends PreferenceFragmentCompat { .addBreadcrumb(R.string.automation) .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_autodownload)); config.index(R.xml.preferences_gpodder) - .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_integrations)) .addBreadcrumb(PreferenceActivity.getTitleOfPage(R.xml.preferences_gpodder)); } } diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml index 8cd1b8be0..2141c811c 100644 --- a/app/src/main/res/xml/preferences.xml +++ b/app/src/main/res/xml/preferences.xml @@ -28,9 +28,9 @@ android:icon="?attr/ic_network" /> - - - - - diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index f10b92f73..ac402946e 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -25,7 +25,6 @@ Cancel\nDownload Playback History gpodder.net - Synchronize with other devices gpodder.net Login Episode cache full The episode cache limit has been reached. You can increase the cache size in the Settings. @@ -345,8 +344,8 @@ Episode auto delete, Import, Export Project Queue - Integrations - Synchronization + Synchronization + Synchronize with other devices using gpodder.net Automation Details Import/Export