Sulkta-OSS/straw
3
0
Fork 0
Code Issues 1 Pull requests 11 Projects Releases Packages Wiki Activity Actions

Merge branch 'feature-4k60f' of git://github.com/mauriciocolli/NewPipe into 4k

Browse source
This commit is contained in:
Christian Schabesberger 2017-04-15 12:52:03 +02:00
commit 06f38cbcb4
17 changed files with 632 additions and 200 deletions
Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/res/values/settings_keys.xml
View file

@ -16,14 +16,24 @@
<string name="default_resolution_key" translatable="false">default_resolution_preference</string>
<string name="default_resolution_value" translatable="false">360p</string>
<string-array name="resolution_list">
<item>Best resolution</item>
<item>1080p60</item>
<item>1080p</item>
<item>720p60</item>
<item>720p</item>
<item>480p</item>
<item>360p</item>
<item>240p</item>
<item>144p</item>
</string-array>
<string name="preferred_video_format_key" translatable="false">preferrfed_video_format</string>
<string name="preferred_video_format_default" translatable="false">WebM</string>
<string name="default_popup_resolution_key" translatable="false">default_popup_resolution_key</string>
<string name="default_popup_resolution_value" translatable="false">480p</string>
<string name="show_higher_resolutions_key" translatable="false">show_higher_resolutions_key</string>
<string name="preferred_video_format_key" translatable="false">preferred_video_format</string>
<string name="preferred_video_format_default" translatable="false">MPEG-4</string>
<string-array name="video_format_list">
<item>WebM</item>
<item>MPEG-4</item>

3
app/src/main/res/values/strings.xml
View file

@ -38,6 +38,9 @@
<string name="autoplay_by_calling_app_title">Autoplay when called from another app</string>
<string name="autoplay_by_calling_app_summary">Automatically play a video when NewPipe is called from another app.</string>
<string name="default_resolution_title">Default resolution</string>
<string name="default_popup_resolution_title">Default popup resolution</string>
<string name="show_higher_resolutions_title">Show higher resolutions</string>
<string name="show_higher_resolutions_summary">Only some devices support playing 2k/4k videos</string>
<string name="play_with_kodi_title">Play with Kodi</string>
<string name="kore_not_found">Kore app not found. Install Kore?</string>
<string name="fdroid_kore_url" translatable="false">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>

21
app/src/main/res/xml/settings.xml
View file

@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
android:title="@string/settings_activity_title"
android:key="general_preferences">
xmlns:tools="http://schemas.android.com/tools"
android:title="@string/settings_activity_title"
android:key="general_preferences">
<PreferenceCategory
android:key="@string/settings_category_video_audio"
@ -25,12 +26,26 @@
android:entryValues="@array/resolution_list"
android:defaultValue="@string/default_resolution_value"/>
<ListPreference
android:key="@string/default_popup_resolution_key"
android:title="@string/default_popup_resolution_title"
android:entries="@array/resolution_list"
android:entryValues="@array/resolution_list"
android:defaultValue="@string/default_popup_resolution_value"/>
<CheckBoxPreference
android:key="@string/show_higher_resolutions_key"
android:title="@string/show_higher_resolutions_title"
android:summary="@string/show_higher_resolutions_summary"
android:defaultValue="false"/>
<ListPreference
android:key="@string/preferred_video_format_key"
android:title="@string/preferred_video_format_title"
android:entries="@array/video_format_list"
android:entryValues="@array/video_format_list"
android:defaultValue="@string/preferred_video_format_default"/>
android:defaultValue="@string/preferred_video_format_default"
tools:summary="MPEG-4"/>
<ListPreference
android:key="@string/default_audio_format_key"