Castopod/AntennaPod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed Services to Integrations

Browse Source
This commit is contained in:
ByteHamster 2018-04-22 19:20:11 +02:00
parent 74a8d34354
commit f2ee5d7ff2
6 changed files with 24 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java
View File

@ -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:
return R.string.services_label;
case R.xml.preferences_integrations:
return R.string.integrations_label;
default:
return R.string.settings_label;
}

16
app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java
View File

@ -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:
setupServicesScreen();
case R.xml.preferences_integrations:
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 ->
openScreen(R.xml.preferences_services, activity));
ui.findPreference(PREF_SCREEN_INTEGRATIONS).setOnPreferenceClickListener(preference ->
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);
}
}

4
app/src/main/res/xml/preferences.xml
View File

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

0
app/src/main/res/xml/preferences_services.xml → app/src/main/res/xml/preferences_integrations.xml
View File

26
app/src/main/res/xml/preferences_network.xml
View File

@ -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/data_usage">
<com.afollestad.materialdialogs.prefs.MaterialEditTextPreference
android:defaultValue="4"
android:inputType="number"
android:key="prefParallelDownloads"
android:title="@string/pref_parallel_downloads_title"
app:useStockLayout="true"/>
<PreferenceCategory android:title="@string/automation">
<Preference
android:key="prefAutoUpdateIntervall"
android:summary="@string/pref_autoUpdateIntervallOrTime_sum"
android:title="@string/pref_autoUpdateIntervallOrTime_title"/>
<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"

3
core/src/main/res/values/strings.xml
View File

@ -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>