From 112edd26083be93aa3086c0c56d7023326f7c054 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <42316180+BoFFire@users.noreply.github.com> Date: Sun, 30 Dec 2018 17:40:17 +0100 Subject: [PATCH 1/9] Updated ar (Arabic) translation Commit made via Stringlate --- app/src/main/res/values-ar/strings.xml | 45 ++++++++++++++++++++++---- 1 file changed, 39 insertions(+), 6 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 0756155..47dc579 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -1,4 +1,3 @@ - PeerTube @@ -36,9 +35,9 @@ - \u0020-\u0020 - \u0020مشاهدات - \@ + \\0020-\\0020 + \\0020مشاهدات + \\@ الصورة المصغرة للفيديو @@ -51,8 +50,8 @@ تشغيل الفيديو عبر بث التورنت . يتطلب هذا أذونات التخزين. (ألفا ، غير مستقر!) الرخصة GNU Affero General Public License v3.0\n - \n - إن أذونات هذا الترخيص الأقوى للحقوق المتروكة مشروطة بإتاحة الشفرة المصدرية الكاملة للأعمال والتعديلات المرخصة ، والتي تشتمل على أعمال أكبر باستخدام عمل مرخص ، تحت نفس الترخيص. يجب الحفاظ على حقوق النشر وإشعارات الترخيص. يقدم المساهمون منحة صريحة لحقوق البراءة. عند استخدام إصدار معدل لتوفير خدمة عبر شبكة ، يجب توفير شفرة المصدر الكاملة للإصدار المعدل. + \n + إن أذونات هذا الترخيص الأقوى للحقوق المتروكة مشروطة بإتاحة الشفرة المصدرية الكاملة للأعمال والتعديلات المرخصة ، والتي تشتمل على أعمال أكبر باستخدام عمل مرخص ، تحت نفس الترخيص. يجب الحفاظ على حقوق النشر وإشعارات الترخيص. يقدم المساهمون منحة صريحة لحقوق البراءة. عند استخدام إصدار معدل لتوفير خدمة عبر شبكة ، يجب توفير شفرة المصدر الكاملة للإصدار المعدل. الإصدار مشاركة PeerTube بحث @@ -60,5 +59,39 @@ المزيد مشاركة PeerTube + الرابط غير صالح! + الوضع الداكن + أعد تشغيل التطبيق لتنشيط الوضع الداكن. + مظهر التطبيق + أعد تشغيل التطبيق لتفعيل التعديلات التي طرأت على المظهر. + + أحمر + وردي + بنفسجي + بنفسجي قاتم + نيلي + أزرق + أزرق فاتح + سماوي + أزرق مُخضرّ + أخضر + أخضر فاتح + جيري + أصفر + كهرماني + برتقالي + برتقالي قاتم + قهوي + رمادي + أزرق رمادي + 0.5x + عادي + 1.5x + 2x + + + التشغيل في الخلفية + إن تم تنشيطه، ستواصل الفيديو في الإشتغال في الخلفية. + المحلي From 32f5a72450455c251ba30f8680ea49065b9fe198 Mon Sep 17 00:00:00 2001 From: ButterflyOfFire <42316180+BoFFire@users.noreply.github.com> Date: Sun, 30 Dec 2018 19:56:23 +0100 Subject: [PATCH 2/9] Minor fix in arabic strings --- app/src/main/res/values-ar/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index 47dc579..e090072 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -35,18 +35,18 @@ - \\0020-\\0020 - \\0020مشاهدات - \\@ + \0020-\0020 + \0020مشاهدات + \@ الصورة المصغرة للفيديو الصورة الرمزية للحساب عرض NSFW - عند التفعيل سيتم عرض محتويات NSFW + عند التنشيط سيتم عرض محتويات NSFW UrlVideoPlayActivity - مشغل فديو التورنت + مشغل فيديو التورنت تشغيل الفيديو عبر بث التورنت . يتطلب هذا أذونات التخزين. (ألفا ، غير مستقر!) الرخصة GNU Affero General Public License v3.0\n From b21b4e945d0d3733e1f3b61d073913cd46f2523f Mon Sep 17 00:00:00 2001 From: lishoujun Date: Mon, 31 Dec 2018 14:50:52 +0800 Subject: [PATCH 3/9] add null check to playerNotificationManager and player on Destroy --- .../peertube/service/VideoPlayerService.java | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java index c23c7d1..bc62ddb 100644 --- a/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java +++ b/app/src/main/java/net/schueller/peertube/service/VideoPlayerService.java @@ -118,11 +118,13 @@ public class VideoPlayerService extends Service { public void onDestroy() { Log.v(TAG, "onDestroy..."); - - playerNotificationManager.setPlayer(null); - player.release(); - player = null; - + if (playerNotificationManager != null) { + playerNotificationManager.setPlayer(null); + } + if (player != null) { + player.release(); + player = null; + } super.onDestroy(); } From 86f36a97ebbe32a24b66c7248167bef9fa842514 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= Date: Mon, 31 Dec 2018 08:54:10 +0100 Subject: [PATCH 4/9] Added changelog --- CHANGELOG.md | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..57b67ce --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,8 @@ +### Version 1.0.17 Tag: v1.0.17 (2018-12-29) + * Replaced more buttons with fonts + * Translated app to Chinese. (@lishoujun) + +### Version 1.0.16 Tag: v1.0.16 (2018-12-28) + * Fullscreen button + * Local Videos + * Bug Fixes From 9541ccf65254557614c0ad808045e8256f771ad6 Mon Sep 17 00:00:00 2001 From: Stefan Schueller Date: Mon, 31 Dec 2018 09:17:12 +0100 Subject: [PATCH 5/9] Version Bump --- CHANGELOG.md | 5 +++++ app/build.gradle | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 57b67ce..9e48cd4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +### Version 1.0.18 Tag: v1.0.18 (2018-12-31) + * Bug Fixes + * Arabic translation update + * Dependence update + ### Version 1.0.17 Tag: v1.0.17 (2018-12-29) * Replaced more buttons with fonts * Translated app to Chinese. (@lishoujun) diff --git a/app/build.gradle b/app/build.gradle index ee781e5..d51e17c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "net.schueller.peertube" minSdkVersion 21 targetSdkVersion 28 - versionCode 1017 - versionName "1.0.17" + versionCode 1018 + versionName "1.0.18" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) From 6e2ef7875193bf3a5ee8d4271676219891bf8847 Mon Sep 17 00:00:00 2001 From: lishoujun Date: Tue, 1 Jan 2019 02:15:35 +0800 Subject: [PATCH 6/9] add languages MultiSelectListPreference. but not all languages. --- .../schueller/peertube/activity/VideoListActivity.java | 7 ++++--- .../peertube/network/GetVideoDataService.java | 8 ++++++-- app/src/main/res/values/array.xml | 10 ++++++++++ app/src/main/res/values/strings.xml | 5 +++++ app/src/main/res/xml/pref_general.xml | 8 ++++++++ 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java index bef23d9..e850419 100644 --- a/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java +++ b/app/src/main/java/net/schueller/peertube/activity/VideoListActivity.java @@ -60,6 +60,7 @@ import net.schueller.peertube.service.VideoPlayerService; import java.util.ArrayList; +import java.util.Set; import retrofit2.Call; import retrofit2.Callback; @@ -253,16 +254,16 @@ public class VideoListActivity extends AppCompatActivity { SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); String nsfw = sharedPref.getBoolean("pref_show_nsfw", false) ? "both" : "false"; - + Set languages = sharedPref.getStringSet("pref_language", null); String apiBaseURL = APIUrlHelper.getUrlWithVersion(this); GetVideoDataService service = RetrofitInstance.getRetrofitInstance(apiBaseURL).create(GetVideoDataService.class); Call call; if (!searchQuery.equals("")) { - call = service.searchVideosData(start, count, sort, nsfw, searchQuery, filter); + call = service.searchVideosData(start, count, sort, nsfw, searchQuery, filter, languages); } else { - call = service.getVideosData(start, count, sort, nsfw, filter); + call = service.getVideosData(start, count, sort, nsfw, filter, languages); } /*Log the URL called*/ diff --git a/app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java b/app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java index b66b727..2159070 100644 --- a/app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java +++ b/app/src/main/java/net/schueller/peertube/network/GetVideoDataService.java @@ -20,6 +20,8 @@ package net.schueller.peertube.network; import net.schueller.peertube.model.Video; import net.schueller.peertube.model.VideoList; +import java.util.Set; + import retrofit2.Call; import retrofit2.http.GET; import retrofit2.http.Path; @@ -32,7 +34,8 @@ public interface GetVideoDataService { @Query("count") int count, @Query("sort") String sort, @Query("nsfw") String nsfw, - @Query("filter") String filter + @Query("filter") String filter, + @Query("languageOneOf") Set languages ); @GET("videos/{id}") @@ -47,6 +50,7 @@ public interface GetVideoDataService { @Query("sort") String sort, @Query("nsfw") String nsfw, @Query("search") String search, - @Query("filter") String filter + @Query("filter") String filter, + @Query("languageOneOf") Set languages ); } \ No newline at end of file diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index 1625c00..6c5083b 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -44,5 +44,15 @@ AppTheme.GRAY AppTheme.BLUEGRAY + + @string/en + @string/fr + + + + en + fr + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8f8f546..cd8057d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,6 +47,8 @@ Show NSFW NSFW content will be shown if enabled. + Show Languages + Select languages be shown. UrlVideoPlayActivity Torrent Video Player Video playback via a torrent stream. This requires Storage Permissions. (Alpha, not stable!) @@ -65,6 +67,9 @@ App Theme Restart App for theme to take effect. + English + French + Red Pink Purple diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml index d287b5d..98b1da9 100644 --- a/app/src/main/res/xml/pref_general.xml +++ b/app/src/main/res/xml/pref_general.xml @@ -22,6 +22,14 @@ android:summary="@string/pref_description_show_nsfw" android:defaultValue="false" /> + + Date: Mon, 31 Dec 2018 20:45:08 +0100 Subject: [PATCH 7/9] - Added all supported languages --- app/src/main/res/values/array.xml | 380 ++++++++++++++++++++++++++++ app/src/main/res/values/strings.xml | 194 +++++++++++++- 2 files changed, 572 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index 6c5083b..e842230 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -45,13 +45,393 @@ AppTheme.BLUEGRAY + @string/ab + @string/aa + @string/af + @string/ak + @string/sq + @string/ase + @string/am + @string/ar + @string/an + @string/hy + @string/as + @string/av + @string/ay + @string/az + @string/bm + @string/ba + @string/eu + @string/be + @string/bn + @string/bi + @string/bs + @string/bzs + @string/br + @string/bfi + @string/bg + @string/my + @string/ca + @string/ch + @string/ce + @string/zh + @string/csl + @string/cv + @string/kw + @string/co + @string/cr + @string/hr + @string/cs + @string/cse + @string/da + @string/dsl + @string/dv + @string/nl + @string/dz @string/en + @string/eo + @string/et + @string/ee + @string/fo + @string/fj + @string/fi @string/fr + @string/fsl + @string/ff + @string/gl + @string/lg + @string/ka + @string/de + @string/gsg + @string/gn + @string/gu + @string/ht + @string/ha + @string/he + @string/hz + @string/hi + @string/ho + @string/hu + @string/is + @string/ig + @string/id + @string/iu + @string/ik + @string/ga + @string/it + @string/ja + @string/jsl + @string/jv + @string/kl + @string/kn + @string/kr + @string/ks + @string/kk + @string/km + @string/ki + @string/rw + @string/ky + @string/tlh + @string/kv + @string/kg + @string/ko + @string/avk + @string/kj + @string/ku + @string/lo + @string/lv + @string/li + @string/ln + @string/lt + @string/jbo + @string/lu + @string/lb + @string/mk + @string/mg + @string/ms + @string/ml + @string/mt + @string/gv + @string/mi + @string/mr + @string/mh + @string/el + @string/mn + @string/na + @string/nv + @string/ng + @string/ne + @string/nd + @string/se + @string/no + @string/nb + @string/nn + @string/ny + @string/oc + @string/oj + @string/or + @string/om + @string/os + @string/pks + @string/pa + @string/fa + @string/pl + @string/pt + @string/ps + @string/qu + @string/ro + @string/rm + @string/rn + @string/ru + @string/rsl + @string/sm + @string/sg + @string/sc + @string/sdl + @string/gd + @string/sr + @string/sh + @string/sn + @string/ii + @string/sd + @string/si + @string/sk + @string/sl + @string/so + @string/sfs + @string/nr + @string/st + @string/es + @string/su + @string/sw + @string/ss + @string/sv + @string/swl + @string/tl + @string/ty + @string/tg + @string/ta + @string/tt + @string/te + @string/th + @string/bo + @string/ti + @string/to + @string/ts + @string/tn + @string/tr + @string/tk + @string/tw + @string/ug + @string/uk + @string/ur + @string/uz + @string/ve + @string/vi + @string/wa + @string/cy + @string/fy + @string/wo + @string/xh + @string/yi + @string/yo + @string/za + @string/zu + ab + aa + af + ak + sq + ase + am + ar + an + hy + as + av + ay + az + bm + ba + eu + be + bn + bi + bs + bzs + br + bfi + bg + my + ca + ch + ce + zh + csl + cv + kw + co + cr + hr + cs + cse + da + dsl + dv + nl + dz en + eo + et + ee + fo + fj + fi fr + fsl + ff + gl + lg + ka + de + gsg + gn + gu + ht + ha + he + hz + hi + ho + hu + is + ig + id + iu + ik + ga + it + ja + jsl + jv + kl + kn + kr + ks + kk + km + ki + rw + ky + tlh + kv + kg + ko + avk + kj + ku + lo + lv + li + ln + lt + jbo + lu + lb + mk + mg + ms + ml + mt + gv + mi + mr + mh + el + mn + na + nv + ng + ne + nd + se + no + nb + nn + ny + oc + oj + or + om + os + pks + pa + fa + pl + pt + ps + qu + ro + rm + rn + ru + rsl + sm + sg + sc + sdl + gd + sr + sh + sn + ii + sd + si + sk + sl + so + sfs + nr + st + es + su + sw + ss + sv + swl + tl + ty + tg + ta + tt + te + th + bo + ti + to + ts + tn + tr + tk + tw + ug + uk + ur + uz + ve + vi + wa + cy + fy + wo + xh + yi + yo + za + zu diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cd8057d..aac92cf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,8 +47,8 @@ Show NSFW NSFW content will be shown if enabled. - Show Languages - Select languages be shown. + Languages filter + Select video languages that should be shown. None selected will show all videos in all languages. UrlVideoPlayActivity Torrent Video Player Video playback via a torrent stream. This requires Storage Permissions. (Alpha, not stable!) @@ -67,8 +67,198 @@ App Theme Restart App for theme to take effect. + Abkhazian + Afar + Afrikaans + Akan + Albanian + American Sign Language + Amharic + Arabic + Aragonese + Armenian + Assamese + Avaric + Aymara + Azerbaijani + Bambara + Bashkir + Basque + Belarusian + Bengali + Bislama + Bosnian + Brazilian Sign Language + Breton + British Sign Language + Bulgarian + Burmese + Catalan + Chamorro + Chechen + Chinese + Chinese Sign Language + Chuvash + Cornish + Corsican + Cree + Croatian + Czech + Czech Sign Language + Danish + Danish Sign Language + Dhivehi + Dutch + Dzongkha English + Esperanto + Estonian + Ewe + Faroese + Fijian + Finnish French + French Sign Language + Fulah + Galician + Ganda + Georgian + German + German Sign Language + Guarani + Gujarati + Haitian + Hausa + Hebrew + Herero + Hindi + Hiri Motu + Hungarian + Icelandic + Igbo + Indonesian + Inuktitut + Inupiaq + Irish + Italian + Japanese + Japanese Sign Language + Javanese + Kalaallisut + Kannada + Kanuri + Kashmiri + Kazakh + Khmer + Kikuyu + Kinyarwanda + Kirghiz + Klingon + Komi + Kongo + Korean + Kotava + Kuanyama + Kurdish + Lao + Latvian + Limburgan + Lingala + Lithuanian + Lojban + Luba-Katanga + Luxembourgish + Macedonian + Malagasy + Malay (macrolanguage) + Malayalam + Maltese + Manx + Maori + Marathi + Marshallese + Modern Greek (1453-) + Mongolian + Nauru + Navajo + Ndonga + Nepali (macrolanguage) + North Ndebele + Northern Sami + Norwegian + Norwegian Bokmål + Norwegian Nynorsk + Nyanja + Occitan + Ojibwa + Oriya (macrolanguage) + Oromo + Ossetian + Pakistan Sign Language + Panjabi + Persian + Polish + Portuguese + Pushto + Quechua + Romanian + Romansh + Rundi + Russian + Russian Sign Language + Samoan + Sango + Sardinian + Saudi Arabian Sign Language + Scottish Gaelic + Serbian + Serbo-Croatian + Shona + Sichuan Yi + Sindhi + Sinhala + Slovak + Slovenian + Somali + South African Sign Language + South Ndebele + Southern Sotho + Spanish + Sundanese + Swahili (macrolanguage) + Swati + Swedish + Swedish Sign Language + Tagalog + Tahitian + Tajik + Tamil + Tatar + Telugu + Thai + Tibetan + Tigrinya + Tonga (Tonga Islands) + Tsonga + Tswana + Turkish + Turkmen + Twi + Uighur + Ukrainian + Urdu + Uzbek + Venda + Vietnamese + Walloon + Welsh + Western Frisian + Wolof + Xhosa + Yiddish + Yoruba + Zhuang + Zulu Red Pink From ce70a0d15d81eb2a819cf5dcd3258bd6642a775d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= Date: Mon, 31 Dec 2018 20:45:50 +0100 Subject: [PATCH 8/9] - Version bump --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d51e17c..8b69e35 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,8 +6,8 @@ android { applicationId "net.schueller.peertube" minSdkVersion 21 targetSdkVersion 28 - versionCode 1018 - versionName "1.0.18" + versionCode 1019 + versionName "1.0.19" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) From 275355bf9ec70d74624a0e5e469955bb11a1d0a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Schu=CC=88ller?= Date: Mon, 31 Dec 2018 20:48:36 +0100 Subject: [PATCH 9/9] - Changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9e48cd4..fc7448a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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) * Bug Fixes * Arabic translation update