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

Merge branch 'backgroundPlayback'

Browse source
This commit is contained in:
Christian Schabesberger 2015-12-20 18:16:28 +01:00
commit 72289ced39
13 changed files with 345 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable-hdpi/ic_play_arrow_white_48dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 283 B

BIN
app/src/main/res/drawable-mdpi/ic_play_arrow_white_48dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 220 B

BIN
app/src/main/res/drawable-xhdpi/ic_play_arrow_white_48dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 343 B

BIN
app/src/main/res/drawable-xxhdpi/ic_play_arrow_white_48dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 461 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_play_arrow_white_48dp.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 605 B

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

@ -6,9 +6,10 @@
<string name="settingsCategoryEtc">settings_category_etc</string>
<!-- Key values -->
<string name="downloadPathPreference">download_path_preference</string>
<string name="useExternalPlayer">use_external_player</string>
<string name="useExternalVideoPlayer">use_external_video_player</string>
<string name="useExternalAudioPlayer">use_external_audio_player</string>
<string name="autoPlayThroughIntent">autoplay_through_intent</string>
<string name="defaultResolutionPreference">default_resulution_preference</string>
<string name="defaultResolutionPreference">default_resolution_preference</string>
<string-array name="resolutionList">
<item>720p</item>
<item>360p</item>
@ -16,7 +17,7 @@
<item>144p</item>
</string-array>
<string name="defaultResolutionListItem">360p</string>
<string name="showPlayWidthKodiPreference">show_play_with_kodi_preference</string>
<string name="showPlayWithKodiPreference">show_play_with_kodi_preference</string>
<string name="defaultAudioFormatPreference">default_audio_format</string>
<string-array name="audioFormatDescriptionList">
<item>@string/webMAudioDescription</item>

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

@ -19,7 +19,8 @@
<string name="chooseBrowser">Choose browser:</string>
<string name="screenRotation">rotation</string>
<string name="title_activity_settings">Settings</string>
<string name="useExternalPlayerTitle">Use external player</string>
<string name="useExternalVideoPlayerTitle">Use external video player</string>
<string name="useExternalAudioPlayerTitle">Use external audio player</string>
<string name="downloadLocation">Download location</string>
<string name="downloadLocationSummary">Path to store downloaded videos in.</string>
<string name="downloadLocationDialogTitle">Enter download path</string>

11
app/src/main/res/xml/settings_screen.xml
View file

@ -8,8 +8,13 @@
android:title="@string/settingsCategoryVideoAudioTitle">
<CheckBoxPreference
android:key="@string/useExternalPlayer"
android:title="@string/useExternalPlayerTitle"
android:key="@string/useExternalVideoPlayer"
android:title="@string/useExternalVideoPlayerTitle"
android:defaultValue="false"/>
<CheckBoxPreference
android:key="@string/useExternalAudioPlayer"
android:title="@string/useExternalAudioPlayerTitle"
android:defaultValue="false"/>
<ListPreference
@ -32,7 +37,7 @@
android:title="@string/settingsCategoryVideoInfoTittle">
<CheckBoxPreference
android:key="@string/showPlayWidthKodiPreference"
android:key="@string/showPlayWithKodiPreference"
android:title="@string/showPlayWithKodiTitle"
android:summary="@string/showPlayWithKodiSummary"
android:defaultValue="false" />