mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-10-31 15:23:00 +00:00
Code Issues Releases Wiki Activity

Fixed 1. Put the tab settings into Aperence settings

Browse Source
This commit is contained in:
Somethingweirdhere
2018-06-16 11:51:43 +02:00
committed by Christian Schabesberger
parent b730cb099f
commit 890b3e13c9
3 changed files with 7 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java
View File

@@ -316,32 +316,6 @@ public class ContentSettingsFragment extends BasePreferenceFragment {
} }
} }
/*//////////////////////////////////////////////////////////////////////////
// Utils
//////////////////////////////////////////////////////////////////////////*/
private String getMainPagePrefSummery(final String mainPrefOldValue, final ListPreference mainPageContentPref) {
if(mainPrefOldValue.equals(getString(R.string.channel_page_key))) {
return defaultPreferences.getString(getString(R.string.main_page_selected_channel_name), "error");
} else {
return mainPageContentPref.getSummary().toString();
}
}
private int getMainPageSummeryByKey(final String key) {
if(key.equals(getString(R.string.blank_page_key))) {
return R.string.blank_page_summary;
} else if(key.equals(getString(R.string.kiosk_page_key))) {
return R.string.kiosk_page_summary;
} else if(key.equals(getString(R.string.feed_page_key))) {
return R.string.feed_page_summary;
} else if(key.equals(getString(R.string.subscription_page_key))) {
return R.string.subscription_page_summary;
} else if(key.equals(getString(R.string.channel_page_key))) {
return R.string.channel_page_summary;
}
return R.string.blank_page_summary;
}
/*////////////////////////////////////////////////////////////////////////// /*//////////////////////////////////////////////////////////////////////////
// Error // Error
//////////////////////////////////////////////////////////////////////////*/ //////////////////////////////////////////////////////////////////////////*/

7
app/src/main/res/xml/appearance_settings.xml
View File

@@ -26,4 +26,11 @@
android:key="@string/caption_settings_key" android:key="@string/caption_settings_key"
android:title="@string/caption_setting_title" android:title="@string/caption_setting_title"
android:summary="@string/caption_setting_description"/> android:summary="@string/caption_setting_description"/>
<PreferenceScreen
android:fragment="org.schabi.newpipe.settings.ContentSettingsMain"
android:summary="@string/main_page_content_summary"
android:key="@string/main_page_content_key"
android:title="@string/main_page_content"/>
</PreferenceScreen> </PreferenceScreen>

6
app/src/main/res/xml/content_settings.xml
View File

@@ -43,12 +43,6 @@
android:title="@string/download_thumbnail_title" android:title="@string/download_thumbnail_title"
android:summary="@string/download_thumbnail_summary"/> android:summary="@string/download_thumbnail_summary"/>
<PreferenceScreen
android:fragment="org.schabi.newpipe.settings.ContentSettingsMain"
android:summary="@string/main_page_content_summary"
android:key="@string/main_page_content_key"
android:title="@string/main_page_content"/>
<Preference <Preference
android:summary="@string/import_data_summary" android:summary="@string/import_data_summary"
android:key="@string/import_data" android:key="@string/import_data"