greg/thorium-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #83 from sschueller/develop

Browse Source 
Release v1.0.19
This commit is contained in:
Stefan Schüller 2018-12-31 20:49:27 +01:00 committed by GitHub
commit d3a2e3ef50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 608 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
### Version 1.0.19 Tag: v1.0.19 (2018-12-31)
* Video Language Filter (@lishoujun)
### Version 1.0.18 Tag: v1.0.18 (2018-12-31) ### Version 1.0.18 Tag: v1.0.18 (2018-12-31)
* Bug Fixes * Bug Fixes
* Arabic translation update * Arabic translation update

4
app/build.gradle
View File

@ -6,8 +6,8 @@ android {
applicationId "net.schueller.peertube" applicationId "net.schueller.peertube"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 28 targetSdkVersion 28
versionCode 1018 versionCode 1019
versionName "1.0.18" versionName "1.0.19"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
dependencies { dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])

7
app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java
View File

@ -60,6 +60,7 @@ import net.schueller.peertube.service.VideoPlayerService;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Set;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.Callback; import retrofit2.Callback;
@ -253,16 +254,16 @@ public class VideoListActivity extends AppCompatActivity {
SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
String nsfw = sharedPref.getBoolean("pref_show_nsfw", false) ? "both" : "false"; String nsfw = sharedPref.getBoolean("pref_show_nsfw", false) ? "both" : "false";
Set<String> languages = sharedPref.getStringSet("pref_language", null);
String apiBaseURL = APIUrlHelper.getUrlWithVersion(this); String apiBaseURL = APIUrlHelper.getUrlWithVersion(this);
GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class); GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class);
Call<VideoList> call; Call<VideoList> call;
if (!searchQuery.equals("")) { if (!searchQuery.equals("")) {
call = service.searchVideosData(start, count, sort, nsfw, searchQuery, filter); call = service.searchVideosData(start, count, sort, nsfw, searchQuery, filter, languages);
} else { } else {
call = service.getVideosData(start, count, sort, nsfw, filter); call = service.getVideosData(start, count, sort, nsfw, filter, languages);
} }
/*Log the URL called*/ /*Log the URL called*/

8
app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java
View File

@ -20,6 +20,8 @@ package net.schueller.peertube.network;
import net.schueller.peertube.model.Video; import net.schueller.peertube.model.Video;
import net.schueller.peertube.model.VideoList; import net.schueller.peertube.model.VideoList;
import java.util.Set;
import retrofit2.Call; import retrofit2.Call;
import retrofit2.http.GET; import retrofit2.http.GET;
import retrofit2.http.Path; import retrofit2.http.Path;
@ -32,7 +34,8 @@ public interface GetVideoDataService {
@Query("count") int count, @Query("count") int count,
@Query("sort") String sort, @Query("sort") String sort,
@Query("nsfw") String nsfw, @Query("nsfw") String nsfw,
@Query("filter") String filter @Query("filter") String filter,
@Query("languageOneOf") Set<String> languages
); );
@GET("videos/{id}") @GET("videos/{id}")
@ -47,6 +50,7 @@ public interface GetVideoDataService {
@Query("sort") String sort, @Query("sort") String sort,
@Query("nsfw") String nsfw, @Query("nsfw") String nsfw,
@Query("search") String search, @Query("search") String search,
@Query("filter") String filter @Query("filter") String filter,
@Query("languageOneOf") Set<String> languages
); );
} }

390
app/src/main/res/values/array.xml
View File

@ -44,5 +44,395 @@
<item>AppTheme.GRAY</item> <item>AppTheme.GRAY</item>
<item>AppTheme.BLUEGRAY</item> <item>AppTheme.BLUEGRAY</item>
</string-array> </string-array>
<string-array name="languageArray">
<item>@string/ab</item>
<item>@string/aa</item>
<item>@string/af</item>
<item>@string/ak</item>
<item>@string/sq</item>
<item>@string/ase</item>
<item>@string/am</item>
<item>@string/ar</item>
<item>@string/an</item>
<item>@string/hy</item>
<item>@string/as</item>
<item>@string/av</item>
<item>@string/ay</item>
<item>@string/az</item>
<item>@string/bm</item>
<item>@string/ba</item>
<item>@string/eu</item>
<item>@string/be</item>
<item>@string/bn</item>
<item>@string/bi</item>
<item>@string/bs</item>
<item>@string/bzs</item>
<item>@string/br</item>
<item>@string/bfi</item>
<item>@string/bg</item>
<item>@string/my</item>
<item>@string/ca</item>
<item>@string/ch</item>
<item>@string/ce</item>
<item>@string/zh</item>
<item>@string/csl</item>
<item>@string/cv</item>
<item>@string/kw</item>
<item>@string/co</item>
<item>@string/cr</item>
<item>@string/hr</item>
<item>@string/cs</item>
<item>@string/cse</item>
<item>@string/da</item>
<item>@string/dsl</item>
<item>@string/dv</item>
<item>@string/nl</item>
<item>@string/dz</item>
<item>@string/en</item>
<item>@string/eo</item>
<item>@string/et</item>
<item>@string/ee</item>
<item>@string/fo</item>
<item>@string/fj</item>
<item>@string/fi</item>
<item>@string/fr</item>
<item>@string/fsl</item>
<item>@string/ff</item>
<item>@string/gl</item>
<item>@string/lg</item>
<item>@string/ka</item>
<item>@string/de</item>
<item>@string/gsg</item>
<item>@string/gn</item>
<item>@string/gu</item>
<item>@string/ht</item>
<item>@string/ha</item>
<item>@string/he</item>
<item>@string/hz</item>
<item>@string/hi</item>
<item>@string/ho</item>
<item>@string/hu</item>
<item>@string/is</item>
<item>@string/ig</item>
<item>@string/id</item>
<item>@string/iu</item>
<item>@string/ik</item>
<item>@string/ga</item>
<item>@string/it</item>
<item>@string/ja</item>
<item>@string/jsl</item>
<item>@string/jv</item>
<item>@string/kl</item>
<item>@string/kn</item>
<item>@string/kr</item>
<item>@string/ks</item>
<item>@string/kk</item>
<item>@string/km</item>
<item>@string/ki</item>
<item>@string/rw</item>
<item>@string/ky</item>
<item>@string/tlh</item>
<item>@string/kv</item>
<item>@string/kg</item>
<item>@string/ko</item>
<item>@string/avk</item>
<item>@string/kj</item>
<item>@string/ku</item>
<item>@string/lo</item>
<item>@string/lv</item>
<item>@string/li</item>
<item>@string/ln</item>
<item>@string/lt</item>
<item>@string/jbo</item>
<item>@string/lu</item>
<item>@string/lb</item>
<item>@string/mk</item>
<item>@string/mg</item>
<item>@string/ms</item>
<item>@string/ml</item>
<item>@string/mt</item>
<item>@string/gv</item>
<item>@string/mi</item>
<item>@string/mr</item>
<item>@string/mh</item>
<item>@string/el</item>
<item>@string/mn</item>
<item>@string/na</item>
<item>@string/nv</item>
<item>@string/ng</item>
<item>@string/ne</item>
<item>@string/nd</item>
<item>@string/se</item>
<item>@string/no</item>
<item>@string/nb</item>
<item>@string/nn</item>
<item>@string/ny</item>
<item>@string/oc</item>
<item>@string/oj</item>
<item>@string/or</item>
<item>@string/om</item>
<item>@string/os</item>
<item>@string/pks</item>
<item>@string/pa</item>
<item>@string/fa</item>
<item>@string/pl</item>
<item>@string/pt</item>
<item>@string/ps</item>
<item>@string/qu</item>
<item>@string/ro</item>
<item>@string/rm</item>
<item>@string/rn</item>
<item>@string/ru</item>
<item>@string/rsl</item>
<item>@string/sm</item>
<item>@string/sg</item>
<item>@string/sc</item>
<item>@string/sdl</item>
<item>@string/gd</item>
<item>@string/sr</item>
<item>@string/sh</item>
<item>@string/sn</item>
<item>@string/ii</item>
<item>@string/sd</item>
<item>@string/si</item>
<item>@string/sk</item>
<item>@string/sl</item>
<item>@string/so</item>
<item>@string/sfs</item>
<item>@string/nr</item>
<item>@string/st</item>
<item>@string/es</item>
<item>@string/su</item>
<item>@string/sw</item>
<item>@string/ss</item>
<item>@string/sv</item>
<item>@string/swl</item>
<item>@string/tl</item>
<item>@string/ty</item>
<item>@string/tg</item>
<item>@string/ta</item>
<item>@string/tt</item>
<item>@string/te</item>
<item>@string/th</item>
<item>@string/bo</item>
<item>@string/ti</item>
<item>@string/to</item>
<item>@string/ts</item>
<item>@string/tn</item>
<item>@string/tr</item>
<item>@string/tk</item>
<item>@string/tw</item>
<item>@string/ug</item>
<item>@string/uk</item>
<item>@string/ur</item>
<item>@string/uz</item>
<item>@string/ve</item>
<item>@string/vi</item>
<item>@string/wa</item>
<item>@string/cy</item>
<item>@string/fy</item>
<item>@string/wo</item>
<item>@string/xh</item>
<item>@string/yi</item>
<item>@string/yo</item>
<item>@string/za</item>
<item>@string/zu</item>
</string-array>
<string-array name="languageValues">
<item>ab</item>
<item>aa</item>
<item>af</item>
<item>ak</item>
<item>sq</item>
<item>ase</item>
<item>am</item>
<item>ar</item>
<item>an</item>
<item>hy</item>
<item>as</item>
<item>av</item>
<item>ay</item>
<item>az</item>
<item>bm</item>
<item>ba</item>
<item>eu</item>
<item>be</item>
<item>bn</item>
<item>bi</item>
<item>bs</item>
<item>bzs</item>
<item>br</item>
<item>bfi</item>
<item>bg</item>
<item>my</item>
<item>ca</item>
<item>ch</item>
<item>ce</item>
<item>zh</item>
<item>csl</item>
<item>cv</item>
<item>kw</item>
<item>co</item>
<item>cr</item>
<item>hr</item>
<item>cs</item>
<item>cse</item>
<item>da</item>
<item>dsl</item>
<item>dv</item>
<item>nl</item>
<item>dz</item>
<item>en</item>
<item>eo</item>
<item>et</item>
<item>ee</item>
<item>fo</item>
<item>fj</item>
<item>fi</item>
<item>fr</item>
<item>fsl</item>
<item>ff</item>
<item>gl</item>
<item>lg</item>
<item>ka</item>
<item>de</item>
<item>gsg</item>
<item>gn</item>
<item>gu</item>
<item>ht</item>
<item>ha</item>
<item>he</item>
<item>hz</item>
<item>hi</item>
<item>ho</item>
<item>hu</item>
<item>is</item>
<item>ig</item>
<item>id</item>
<item>iu</item>
<item>ik</item>
<item>ga</item>
<item>it</item>
<item>ja</item>
<item>jsl</item>
<item>jv</item>
<item>kl</item>
<item>kn</item>
<item>kr</item>
<item>ks</item>
<item>kk</item>
<item>km</item>
<item>ki</item>
<item>rw</item>
<item>ky</item>
<item>tlh</item>
<item>kv</item>
<item>kg</item>
<item>ko</item>
<item>avk</item>
<item>kj</item>
<item>ku</item>
<item>lo</item>
<item>lv</item>
<item>li</item>
<item>ln</item>
<item>lt</item>
<item>jbo</item>
<item>lu</item>
<item>lb</item>
<item>mk</item>
<item>mg</item>
<item>ms</item>
<item>ml</item>
<item>mt</item>
<item>gv</item>
<item>mi</item>
<item>mr</item>
<item>mh</item>
<item>el</item>
<item>mn</item>
<item>na</item>
<item>nv</item>
<item>ng</item>
<item>ne</item>
<item>nd</item>
<item>se</item>
<item>no</item>
<item>nb</item>
<item>nn</item>
<item>ny</item>
<item>oc</item>
<item>oj</item>
<item>or</item>
<item>om</item>
<item>os</item>
<item>pks</item>
<item>pa</item>
<item>fa</item>
<item>pl</item>
<item>pt</item>
<item>ps</item>
<item>qu</item>
<item>ro</item>
<item>rm</item>
<item>rn</item>
<item>ru</item>
<item>rsl</item>
<item>sm</item>
<item>sg</item>
<item>sc</item>
<item>sdl</item>
<item>gd</item>
<item>sr</item>
<item>sh</item>
<item>sn</item>
<item>ii</item>
<item>sd</item>
<item>si</item>
<item>sk</item>
<item>sl</item>
<item>so</item>
<item>sfs</item>
<item>nr</item>
<item>st</item>
<item>es</item>
<item>su</item>
<item>sw</item>
<item>ss</item>
<item>sv</item>
<item>swl</item>
<item>tl</item>
<item>ty</item>
<item>tg</item>
<item>ta</item>
<item>tt</item>
<item>te</item>
<item>th</item>
<item>bo</item>
<item>ti</item>
<item>to</item>
<item>ts</item>
<item>tn</item>
<item>tr</item>
<item>tk</item>
<item>tw</item>
<item>ug</item>
<item>uk</item>
<item>ur</item>
<item>uz</item>
<item>ve</item>
<item>vi</item>
<item>wa</item>
<item>cy</item>
<item>fy</item>
<item>wo</item>
<item>xh</item>
<item>yi</item>
<item>yo</item>
<item>za</item>
<item>zu</item>
</string-array>
<string-array name="empty_array"/>
</resources> </resources>

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

@ -47,6 +47,8 @@
<string name="pref_title_show_nsfw">Show NSFW</string> <string name="pref_title_show_nsfw">Show NSFW</string>
<string name="pref_description_show_nsfw">NSFW content will be shown if enabled.</string> <string name="pref_description_show_nsfw">NSFW content will be shown if enabled.</string>
<string name="pref_language">Languages filter</string>
<string name="pref_description_language">Select video languages that should be shown. None selected will show all videos in all languages.</string>
<string name="title_activity_url_video_play">UrlVideoPlayActivity</string> <string name="title_activity_url_video_play">UrlVideoPlayActivity</string>
<string name="pref_title_torrent_player">Torrent Video Player</string> <string name="pref_title_torrent_player">Torrent Video Player</string>
<string name="pref_description_torrent_player">Video playback via a torrent stream. This requires Storage Permissions. (Alpha, not stable!)</string> <string name="pref_description_torrent_player">Video playback via a torrent stream. This requires Storage Permissions. (Alpha, not stable!)</string>
@ -65,6 +67,199 @@
<string name="pref_title_app_theme">App Theme</string> <string name="pref_title_app_theme">App Theme</string>
<string name="pref_description_app_theme">Restart App for theme to take effect.</string> <string name="pref_description_app_theme">Restart App for theme to take effect.</string>
<string name="ab">Abkhazian</string>
<string name="aa">Afar</string>
<string name="af">Afrikaans</string>
<string name="ak">Akan</string>
<string name="sq">Albanian</string>
<string name="ase">American Sign Language</string>
<string name="am">Amharic</string>
<string name="ar">Arabic</string>
<string name="an">Aragonese</string>
<string name="hy">Armenian</string>
<string name="as">Assamese</string>
<string name="av">Avaric</string>
<string name="ay">Aymara</string>
<string name="az">Azerbaijani</string>
<string name="bm">Bambara</string>
<string name="ba">Bashkir</string>
<string name="eu">Basque</string>
<string name="be">Belarusian</string>
<string name="bn">Bengali</string>
<string name="bi">Bislama</string>
<string name="bs">Bosnian</string>
<string name="bzs">Brazilian Sign Language</string>
<string name="br">Breton</string>
<string name="bfi">British Sign Language</string>
<string name="bg">Bulgarian</string>
<string name="my">Burmese</string>
<string name="ca">Catalan</string>
<string name="ch">Chamorro</string>
<string name="ce">Chechen</string>
<string name="zh">Chinese</string>
<string name="csl">Chinese Sign Language</string>
<string name="cv">Chuvash</string>
<string name="kw">Cornish</string>
<string name="co">Corsican</string>
<string name="cr">Cree</string>
<string name="hr">Croatian</string>
<string name="cs">Czech</string>
<string name="cse">Czech Sign Language</string>
<string name="da">Danish</string>
<string name="dsl">Danish Sign Language</string>
<string name="dv">Dhivehi</string>
<string name="nl">Dutch</string>
<string name="dz">Dzongkha</string>
<string name="en">English</string>
<string name="eo">Esperanto</string>
<string name="et">Estonian</string>
<string name="ee">Ewe</string>
<string name="fo">Faroese</string>
<string name="fj">Fijian</string>
<string name="fi">Finnish</string>
<string name="fr">French</string>
<string name="fsl">French Sign Language</string>
<string name="ff">Fulah</string>
<string name="gl">Galician</string>
<string name="lg">Ganda</string>
<string name="ka">Georgian</string>
<string name="de">German</string>
<string name="gsg">German Sign Language</string>
<string name="gn">Guarani</string>
<string name="gu">Gujarati</string>
<string name="ht">Haitian</string>
<string name="ha">Hausa</string>
<string name="he">Hebrew</string>
<string name="hz">Herero</string>
<string name="hi">Hindi</string>
<string name="ho">Hiri Motu</string>
<string name="hu">Hungarian</string>
<string name="is">Icelandic</string>
<string name="ig">Igbo</string>
<string name="id">Indonesian</string>
<string name="iu">Inuktitut</string>
<string name="ik">Inupiaq</string>
<string name="ga">Irish</string>
<string name="it">Italian</string>
<string name="ja">Japanese</string>
<string name="jsl">Japanese Sign Language</string>
<string name="jv">Javanese</string>
<string name="kl">Kalaallisut</string>
<string name="kn">Kannada</string>
<string name="kr">Kanuri</string>
<string name="ks">Kashmiri</string>
<string name="kk">Kazakh</string>
<string name="km">Khmer</string>
<string name="ki">Kikuyu</string>
<string name="rw">Kinyarwanda</string>
<string name="ky">Kirghiz</string>
<string name="tlh">Klingon</string>
<string name="kv">Komi</string>
<string name="kg">Kongo</string>
<string name="ko">Korean</string>
<string name="avk">Kotava</string>
<string name="kj">Kuanyama</string>
<string name="ku">Kurdish</string>
<string name="lo">Lao</string>
<string name="lv">Latvian</string>
<string name="li">Limburgan</string>
<string name="ln">Lingala</string>
<string name="lt">Lithuanian</string>
<string name="jbo">Lojban</string>
<string name="lu">Luba-Katanga</string>
<string name="lb">Luxembourgish</string>
<string name="mk">Macedonian</string>
<string name="mg">Malagasy</string>
<string name="ms">Malay (macrolanguage)</string>
<string name="ml">Malayalam</string>
<string name="mt">Maltese</string>
<string name="gv">Manx</string>
<string name="mi">Maori</string>
<string name="mr">Marathi</string>
<string name="mh">Marshallese</string>
<string name="el">Modern Greek (1453-)</string>
<string name="mn">Mongolian</string>
<string name="na">Nauru</string>
<string name="nv">Navajo</string>
<string name="ng">Ndonga</string>
<string name="ne">Nepali (macrolanguage)</string>
<string name="nd">North Ndebele</string>
<string name="se">Northern Sami</string>
<string name="no">Norwegian</string>
<string name="nb">Norwegian Bokmål</string>
<string name="nn">Norwegian Nynorsk</string>
<string name="ny">Nyanja</string>
<string name="oc">Occitan</string>
<string name="oj">Ojibwa</string>
<string name="or">Oriya (macrolanguage)</string>
<string name="om">Oromo</string>
<string name="os">Ossetian</string>
<string name="pks">Pakistan Sign Language</string>
<string name="pa">Panjabi</string>
<string name="fa">Persian</string>
<string name="pl">Polish</string>
<string name="pt">Portuguese</string>
<string name="ps">Pushto</string>
<string name="qu">Quechua</string>
<string name="ro">Romanian</string>
<string name="rm">Romansh</string>
<string name="rn">Rundi</string>
<string name="ru">Russian</string>
<string name="rsl">Russian Sign Language</string>
<string name="sm">Samoan</string>
<string name="sg">Sango</string>
<string name="sc">Sardinian</string>
<string name="sdl">Saudi Arabian Sign Language</string>
<string name="gd">Scottish Gaelic</string>
<string name="sr">Serbian</string>
<string name="sh">Serbo-Croatian</string>
<string name="sn">Shona</string>
<string name="ii">Sichuan Yi</string>
<string name="sd">Sindhi</string>
<string name="si">Sinhala</string>
<string name="sk">Slovak</string>
<string name="sl">Slovenian</string>
<string name="so">Somali</string>
<string name="sfs">South African Sign Language</string>
<string name="nr">South Ndebele</string>
<string name="st">Southern Sotho</string>
<string name="es">Spanish</string>
<string name="su">Sundanese</string>
<string name="sw">Swahili (macrolanguage)</string>
<string name="ss">Swati</string>
<string name="sv">Swedish</string>
<string name="swl">Swedish Sign Language</string>
<string name="tl">Tagalog</string>
<string name="ty">Tahitian</string>
<string name="tg">Tajik</string>
<string name="ta">Tamil</string>
<string name="tt">Tatar</string>
<string name="te">Telugu</string>
<string name="th">Thai</string>
<string name="bo">Tibetan</string>
<string name="ti">Tigrinya</string>
<string name="to">Tonga (Tonga Islands)</string>
<string name="ts">Tsonga</string>
<string name="tn">Tswana</string>
<string name="tr">Turkish</string>
<string name="tk">Turkmen</string>
<string name="tw">Twi</string>
<string name="ug">Uighur</string>
<string name="uk">Ukrainian</string>
<string name="ur">Urdu</string>
<string name="uz">Uzbek</string>
<string name="ve">Venda</string>
<string name="vi">Vietnamese</string>
<string name="wa">Walloon</string>
<string name="cy">Welsh</string>
<string name="fy">Western Frisian</string>
<string name="wo">Wolof</string>
<string name="xh">Xhosa</string>
<string name="yi">Yiddish</string>
<string name="yo">Yoruba</string>
<string name="za">Zhuang</string>
<string name="zu">Zulu</string>
<string name="red">Red</string> <string name="red">Red</string>
<string name="pink">Pink</string> <string name="pink">Pink</string>
<string name="purple">Purple</string> <string name="purple">Purple</string>

8
app/src/main/res/xml/pref_general.xml
View File

@ -22,6 +22,14 @@
android:summary="@string/pref_description_show_nsfw" android:summary="@string/pref_description_show_nsfw"
android:defaultValue="false" /> android:defaultValue="false" />
<MultiSelectListPreference
android:defaultValue="@array/empty_array"
android:entries="@array/languageArray"
android:entryValues="@array/languageValues"
android:key="pref_language"
android:summary="@string/pref_description_language"
android:title="@string/pref_language" />
<ListPreference <ListPreference
android:title="@string/pref_title_app_theme" android:title="@string/pref_title_app_theme"
android:summary="@string/pref_description_app_theme" android:summary="@string/pref_description_app_theme"