mirror of
https://github.com/TeamNewPipe/NewPipe
synced 2024-12-23 08:30:44 +00:00
Fixed 1. Put the tab settings into Aperence settings
This commit is contained in:
parent
b730cb099f
commit
890b3e13c9
@ -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
|
||||||
//////////////////////////////////////////////////////////////////////////*/
|
//////////////////////////////////////////////////////////////////////////*/
|
||||||
|
@ -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>
|
||||||
|
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user