From ccdfb76bdf3cce32af15ada79487fdf7c9c3faaf Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sat, 29 Jul 2023 16:42:03 +0200 Subject: [PATCH] feat: support for video visibility and license --- .../java/com/github/libretube/api/obj/Streams.kt | 3 +++ .../github/libretube/ui/fragments/PlayerFragment.kt | 12 +++++++++++- app/src/main/res/layout/fragment_player.xml | 2 +- app/src/main/res/values/strings.xml | 3 +++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/github/libretube/api/obj/Streams.kt b/app/src/main/java/com/github/libretube/api/obj/Streams.kt index 7fd123304..700761162 100644 --- a/app/src/main/java/com/github/libretube/api/obj/Streams.kt +++ b/app/src/main/java/com/github/libretube/api/obj/Streams.kt @@ -18,6 +18,9 @@ data class Streams( val uploaderAvatar: String? = null, val thumbnailUrl: String, val category: String, + val license: String, + val visibility: String, + val tags: List, val hls: String? = null, val dash: String? = null, val lbryId: String? = null, diff --git a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt index 5fc363cb0..0a9cc2eb2 100644 --- a/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt @@ -984,7 +984,17 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions { val description = streams.description setupDescription(binding.playerDescription, description) - binding.videoCategory.text = "${context?.getString(R.string.category)}: ${streams.category}" + val visibility = when (streams.visibility) { + "public" -> context?.getString(R.string.visibility_public) + "unlisted" -> context?.getString(R.string.visibility_unlisted) + // currently no other visibility could be returned, might change in the future however + else -> streams.visibility.replaceFirstChar { + if (it.isLowerCase()) it.titlecase(Locale.getDefault()) else it.toString() + } + }.orEmpty() + binding.additionalVideoInfo.text = "${context?.getString(R.string.category)}: ${streams.category}\n" + + "${context?.getString(R.string.license)}: ${streams.license}\n" + + "${context?.getString(R.string.visibility)}: $visibility" binding.playerChannel.setOnClickListener { val activity = view?.context as MainActivity diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 488de8ebb..28263a0aa 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -125,7 +125,7 @@ android:textSize="14sp" /> Load videos via the proxy if connecting to YouTube directly doesn\'t work for the current video (increases the initial loading times). If disabled, YouTube music content likely won\'t play due to YT restrictions. Enable DeArrow Show more accurate and less sensationalist titles and thumbnails. Increases loading times. + Visibility + Public + Unlisted Import subscriptions from