Renamed Services to Integrations

app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java

@@ -149,8 +149,8 @@ public class PreferenceActivity extends AppCompatActivity {
                     return R.string.storage_pref;
                 case R.xml.preferences_user_interface:
                     return R.string.user_interface_label;
-                case R.xml.preferences_services:
+                case R.xml.preferences_integrations:
-                    return R.string.services_label;
+                    return R.string.integrations_label;
                 default:
                     return R.string.settings_label;
             }

app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java

@@ -96,7 +96,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     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_SERVICES = "prefScreenServices";
+    private static final String PREF_SCREEN_INTEGRATIONS = "prefScreenIntegrations";
     private static final String PREF_SCREEN_STORAGE = "prefScreenStorage";
     private static final String PREF_SCREEN_AUTODL = "prefAutoDownloadSettings";
 
@@ -178,8 +178,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 PreferenceControllerFlavorHelper.setupFlavoredUI(ui);
                 buildSmartMarkAsPlayedPreference();
                 break;
-            case R.xml.preferences_services:
+            case R.xml.preferences_integrations:
-                setupServicesScreen();
+                setupIntegrationsScreen();
                 break;
             case R.xml.preferences_storage:
                 setupStorageScreen();
@@ -299,7 +299,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
         );
     }
 
-    private void setupServicesScreen() {
+    private void setupIntegrationsScreen() {
         final Activity activity = ui.getActivity();
 
         ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setOnPreferenceClickListener(
@@ -500,8 +500,8 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
                 openScreen(R.xml.preferences_playback, activity));
         ui.findPreference(PREF_SCREEN_NETWORK).setOnPreferenceClickListener(preference ->
                 openScreen(R.xml.preferences_network, activity));
-        ui.findPreference(PREF_SCREEN_SERVICES).setOnPreferenceClickListener(preference ->
+        ui.findPreference(PREF_SCREEN_INTEGRATIONS).setOnPreferenceClickListener(preference ->
-                openScreen(R.xml.preferences_services, activity));
+                openScreen(R.xml.preferences_integrations, activity));
         ui.findPreference(PREF_SCREEN_STORAGE).setOnPreferenceClickListener(preference ->
                 openScreen(R.xml.preferences_storage, activity));
 
@@ -627,7 +627,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
             case R.xml.preferences_storage:
                 setDataFolderText();
                 break;
-            case R.xml.preferences_services:
+            case R.xml.preferences_integrations:
                 GpodnetPreferences.registerOnSharedPreferenceChangeListener(gpoddernetListener);
                 updateGpodnetPreferenceScreen();
                 checkFlattrItemVisibility();
@@ -639,7 +639,7 @@ public class PreferenceController implements SharedPreferences.OnSharedPreferenc
     }
 
     public void onPause(int screen) {
-        if (screen == R.xml.preferences_services) {
+        if (screen == R.xml.preferences_integrations) {
             GpodnetPreferences.unregisterOnSharedPreferenceChangeListener(gpoddernetListener);
         }
     }

app/src/main/res/xml/preferences.xml

@@ -17,8 +17,8 @@
             android:icon="?attr/ic_swap" />
 
     <Preference
-            android:key="prefScreenServices"
+            android:key="prefScreenIntegrations"
-            android:title="@string/services_label"
+            android:title="@string/integrations_label"
             android:icon="?attr/ic_unfav" />
 
     <Preference

app/src/main/res/xml/preferences_network.xml

@@ -2,27 +2,17 @@
 <PreferenceScreen
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto">
-
+    <PreferenceCategory android:title="@string/automation">
-    <PreferenceCategory android:title="@string/data_usage">
+        <Preference
-        <com.afollestad.materialdialogs.prefs.MaterialEditTextPreference
+                android:key="prefAutoUpdateIntervall"
-                android:defaultValue="4"
+                android:summary="@string/pref_autoUpdateIntervallOrTime_sum"
-                android:inputType="number"
+                android:title="@string/pref_autoUpdateIntervallOrTime_title"/>
-                android:key="prefParallelDownloads"
-                android:title="@string/pref_parallel_downloads_title"
-                app:useStockLayout="true"/>
         <de.danoeh.antennapod.preferences.SwitchCompatPreference
                 android:defaultValue="false"
                 android:enabled="true"
                 android:key="prefMobileUpdate"
                 android:summary="@string/pref_mobileUpdate_sum"
                 android:title="@string/pref_mobileUpdate_title"/>
-    </PreferenceCategory>
-
-    <PreferenceCategory android:title="@string/automation">
-        <Preference
-                android:key="prefAutoUpdateIntervall"
-                android:summary="@string/pref_autoUpdateIntervallOrTime_sum"
-                android:title="@string/pref_autoUpdateIntervallOrTime_title"/>
         <Preference
                 android:summary="@string/pref_automatic_download_sum"
                 android:key="prefAutoDownloadSettings"
@@ -30,6 +20,12 @@
     </PreferenceCategory>
 
     <PreferenceCategory android:title="@string/download_pref_details">
+        <com.afollestad.materialdialogs.prefs.MaterialEditTextPreference
+                android:defaultValue="4"
+                android:inputType="number"
+                android:key="prefParallelDownloads"
+                android:title="@string/pref_parallel_downloads_title"
+                app:useStockLayout="true"/>
         <de.danoeh.antennapod.preferences.SwitchCompatPreference
                 android:defaultValue="true"
                 android:enabled="true"

core/src/main/res/values/strings.xml

@@ -311,10 +311,9 @@
     <string name="other_pref">Other</string>
     <string name="about_pref">About</string>
     <string name="queue_label">Queue</string>
-    <string name="services_label">Services</string>
+    <string name="integrations_label">Integrations</string>
     <string name="flattr_label">Flattr</string>
     <string name="flattr_summary">Micropayment service</string>
-    <string name="data_usage">Data usage</string>
     <string name="automation">Automation</string>
     <string name="download_pref_details">Details</string>
     <string name="import_export_pref">Import/Export</string>