Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Categorized settings & moved AbstractVideoInfo into service folder

This commit is contained in:
Christian Schabesberger 2015-11-25 21:08:19 +01:00
parent 67324bfc80
commit 7f86872139
7 changed files with 79 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/VideoInfo.java
View File

@ -2,6 +2,8 @@ package org.schabi.newpipe;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import org.schabi.newpipe.services.AbstractVideoInfo;
import java.util.List; import java.util.List;
/** /**

2
app/src/main/java/org/schabi/newpipe/VideoPreviewInfo.java
View File

@ -4,6 +4,8 @@ import android.graphics.Bitmap;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;
import org.schabi.newpipe.services.AbstractVideoInfo;
/** /**
* Created by Christian Schabesberger on 26.08.15. * Created by Christian Schabesberger on 26.08.15.
* *

2
app/src/main/java/org/schabi/newpipe/AbstractVideoInfo.java → app/src/main/java/org/schabi/newpipe/services/AbstractVideoInfo.java
View File

@ -1,4 +1,4 @@
package org.schabi.newpipe; package org.schabi.newpipe.services;
import android.graphics.Bitmap; import android.graphics.Bitmap;

3
app/src/main/res/values-de/strings.xml
View File

@ -49,4 +49,7 @@
<string name="showNextAndSimilarTitle">Zeige nächstes und ähnliche Videos</string> <string name="showNextAndSimilarTitle">Zeige nächstes und ähnliche Videos</string>
<string name="urlNotSupportedText">URL wird nicht unterstützt.</string> <string name="urlNotSupportedText">URL wird nicht unterstützt.</string>
<string name="showSimilarVideosButtonText">Ähnliche Videos</string> <string name="showSimilarVideosButtonText">Ähnliche Videos</string>
<string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
<string name="settingsCategoryVideoInfoTittle">INFO</string>
<string name="settingsCategoryEtcTitle">ETC</string>
</resources> </resources>

5
app/src/main/res/values/settings_keys.xml
View File

@ -1,5 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- Categories -->
<string name="settingsCategoryVideoAudio">settings_categoery_video_audio</string>
<string name="settingsCategoryVideoInfo">settings_category_video_info</string>
<string name="settingsCategoryEtc">settings_category_etc</string>
<!-- Key values -->
<string name="downloadPathPreference">download_path_preference</string> <string name="downloadPathPreference">download_path_preference</string>
<string name="useExternalPlayer">use_external_player</string> <string name="useExternalPlayer">use_external_player</string>
<string name="autoPlayThroughIntent">autoplay_through_intent</string> <string name="autoPlayThroughIntent">autoplay_through_intent</string>

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

@ -50,4 +50,7 @@
<string name="urlNotSupportedText">URL not supported.</string> <string name="urlNotSupportedText">URL not supported.</string>
<string name="showSimilarVideosButtonText">Similar videos</string> <string name="showSimilarVideosButtonText">Similar videos</string>
<string name="searchLanguageTitle">Preferable content language</string> <string name="searchLanguageTitle">Preferable content language</string>
<string name="settingsCategoryVideoAudioTitle">VIDEO &amp; AUDIO</string>
<string name="settingsCategoryVideoInfoTittle">INFO</string>
<string name="settingsCategoryEtcTitle">ETC</string>
</resources> </resources>

110
app/src/main/res/xml/settings_screen.xml
View File

@ -3,59 +3,75 @@
android:title="@string/title_activity_settings" android:title="@string/title_activity_settings"
android:key="general_preferences"> android:key="general_preferences">
<CheckBoxPreference <PreferenceCategory
android:key="@string/useExternalPlayer" android:key="@string/settingsCategoryVideoAudio"
android:title="@string/useExternalPlayerTitle" android:title="@string/settingsCategoryVideoAudioTitle">
android:defaultValue="false"/>
<EditTextPreference <CheckBoxPreference
android:key="@string/downloadPathPreference" android:key="@string/useExternalPlayer"
android:title="@string/downloadLocation" android:title="@string/useExternalPlayerTitle"
android:summary="@string/downloadLocationSummary" android:defaultValue="false"/>
android:dialogTitle="@string/downloadLocationDialogTitle"
android:defaultValue=""/>
<CheckBoxPreference <ListPreference
android:key="@string/autoPlayThroughIntent" android:key="@string/defaultResolutionPreference"
android:title="@string/autoPlayThroughIntentTitle" android:title="@string/defaultResolutionPreferenceTitle"
android:summary="@string/autoPlayThroughIntentSummary" android:entries="@array/resolutionList"
android:defaultValue="false" /> android:entryValues="@array/resolutionList"
android:defaultValue="@string/defaultResolutionListItem"/>
<ListPreference <ListPreference
android:key="@string/defaultResolutionPreference" android:key="@string/defaultAudioFormatPreference"
android:title="@string/defaultResolutionPreferenceTitle" android:title="@string/defaultAudioFormatTitle"
android:entries="@array/resolutionList" android:entries="@array/audioFormatDescriptionList"
android:entryValues="@array/resolutionList" android:entryValues="@array/audioFormatList"
android:defaultValue="@string/defaultResolutionListItem"/> android:defaultValue="@string/defaultAudioFormat"/>
<CheckBoxPreference </PreferenceCategory>
android:key="@string/showPlayWidthKodiPreference" <PreferenceCategory
android:title="@string/showPlayWithKodiTitle" android:key="@string/settingsCategoryVideoInfo"
android:summary="@string/showPlayWithKodiSummary" android:title="@string/settingsCategoryVideoInfoTittle">
android:defaultValue="false" />
<CheckBoxPreference <CheckBoxPreference
android:key="@string/leftHandLayout" android:key="@string/showPlayWidthKodiPreference"
android:title="@string/leftPlayButtonTitle" android:title="@string/showPlayWithKodiTitle"
android:defaultValue="false" /> android:summary="@string/showPlayWithKodiSummary"
android:defaultValue="false" />
<ListPreference <CheckBoxPreference
android:key="@string/defaultAudioFormatPreference" android:key="@string/leftHandLayout"
android:title="@string/defaultAudioFormatTitle" android:title="@string/leftPlayButtonTitle"
android:entries="@array/audioFormatDescriptionList" android:defaultValue="false" />
android:entryValues="@array/audioFormatList"
android:defaultValue="@string/defaultAudioFormat"/>
<CheckBoxPreference <ListPreference
android:key="@string/showNextVideo" android:key="@string/searchLanguage"
android:title="@string/showNextAndSimilarTitle" android:title="@string/searchLanguageTitle"
android:defaultValue="true" /> android:entries="@array/languageNames"
android:entryValues="@array/languageCodes"
android:defaultValue="en" />
<ListPreference <CheckBoxPreference
android:key="@string/searchLanguage" android:key="@string/showNextVideo"
android:title="@string/searchLanguageTitle" android:title="@string/showNextAndSimilarTitle"
android:entries="@array/languageNames" android:defaultValue="true" />
android:entryValues="@array/languageCodes"
android:defaultValue="en" /> </PreferenceCategory>
<PreferenceCategory
android:key="@string/settingsCategoryEtc"
android:title="@string/settingsCategoryEtcTitle">
<EditTextPreference
android:key="@string/downloadPathPreference"
android:title="@string/downloadLocation"
android:summary="@string/downloadLocationSummary"
android:dialogTitle="@string/downloadLocationDialogTitle"
android:defaultValue=""/>
<CheckBoxPreference
android:key="@string/autoPlayThroughIntent"
android:title="@string/autoPlayThroughIntentTitle"
android:summary="@string/autoPlayThroughIntentSummary"
android:defaultValue="false" />
</PreferenceCategory>
</PreferenceScreen> </PreferenceScreen>