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 13dd5efea..17c5965c5 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 @@ -4,31 +4,27 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties @JsonIgnoreProperties(ignoreUnknown = true) data class Streams( - val title: String?, - val description: String?, - val uploadDate: String?, - val uploader: String?, - val uploaderUrl: String?, - val uploaderAvatar: String?, - val thumbnailUrl: String?, - val hls: String?, - val dash: String?, - val lbryId: String?, - val uploaderVerified: Boolean?, - val duration: Long?, - val views: Long?, - val likes: Long?, - val dislikes: Long?, - val audioStreams: List?, - val videoStreams: List?, - val relatedStreams: List?, - val subtitles: List?, - val livestream: Boolean?, - val proxyUrl: String?, - val chapters: List? -) { - constructor() : this( - "", "", "", "", "", "", "", "", "", "", null, -1, -1, -1, -1, emptyList(), emptyList(), - emptyList(), emptyList(), null, "", emptyList() - ) -} + val title: String? = null, + val description: String? = null, + val uploadDate: String? = null, + val uploader: String? = null, + val uploaderUrl: String? = null, + val uploaderAvatar: String? = null, + val thumbnailUrl: String? = null, + val hls: String? = null, + val dash: String? = null, + val lbryId: String? = null, + val uploaderVerified: Boolean? = null, + val duration: Long? = null, + val views: Long? = null, + val likes: Long? = null, + val dislikes: Long? = null, + val audioStreams: List? = null, + val videoStreams: List? = null, + val relatedStreams: List? = null, + val subtitles: List? = null, + val livestream: Boolean? = null, + val proxyUrl: String? = null, + val chapters: List? = null, + val uploaderSubscriberCount: Long? = 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 4ddb1e203..d6a82c925 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 @@ -943,6 +943,8 @@ class PlayerFragment : BaseFragment() { playerTitle.text = response.title playerDescription.text = response.description + + playerChannelSubCount.text = context?.getString(R.string.subscribers, response.uploaderSubscriberCount?.formatShort()) } // duration that's not greater than 0 indicates that the video is live diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml index 1a6091f25..407fc1e4f 100644 --- a/app/src/main/res/layout/fragment_player.xml +++ b/app/src/main/res/layout/fragment_player.xml @@ -181,7 +181,8 @@ android:autoSizeTextType="uniform" android:gravity="center" android:maxLines="1" - android:text="@string/download" /> + android:text="@string/download" + tools:targetApi="o" /> - @@ -251,34 +253,50 @@ android:id="@+id/player_channelImage" android:layout_width="40dp" android:layout_height="40dp" - android:layout_centerVertical="true" + android:layout_gravity="center" android:layout_marginEnd="4dp" /> - + android:orientation="vertical"> + + + + + - +