kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 08:20:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #4560 from FineFindus/feat/show-endscreen-on-end

Browse Source 
feat: show controls on STATE_ENDED
This commit is contained in:
Bnyro 2023-08-20 13:06:58 +02:00 committed by GitHub
commit ab9e543291
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/github/libretube/api/obj/Instances.kt
View File

@ -16,5 +16,5 @@ data class Instances(
@SerialName("cache") val chache: Boolean = false, @SerialName("cache") val chache: Boolean = false,
@SerialName("s3_enabled") val s3Enabled: Boolean = false, @SerialName("s3_enabled") val s3Enabled: Boolean = false,
@SerialName("image_proxy_url") val imageProxyUrl: String = "", @SerialName("image_proxy_url") val imageProxyUrl: String = "",
@SerialName("registration_disabled") val registrationDisabled: Boolean = false, @SerialName("registration_disabled") val registrationDisabled: Boolean = false
) )

4
app/src/main/java/com/github/libretube/ui/adapters/InstancesAdapter.kt
View File

@ -31,8 +31,10 @@ class InstancesAdapter(
holder.binding.apply { holder.binding.apply {
var instanceText = "${instance.name} ${instance.locations}" var instanceText = "${instance.name} ${instance.locations}"
if (instance.cdn) instanceText += " (\uD83C\uDF10 CDN)" if (instance.cdn) instanceText += " (\uD83C\uDF10 CDN)"
if (instance.registrationDisabled) instanceText += if (instance.registrationDisabled) {
instanceText +=
" (${root.context.getString(R.string.registration_disabled)})" " (${root.context.getString(R.string.registration_disabled)})"
}
radioButton.text = instanceText radioButton.text = instanceText
radioButton.setOnCheckedChangeListener(null) radioButton.setOnCheckedChangeListener(null)
radioButton.isChecked = selectedInstanceIndex == position radioButton.isChecked = selectedInstanceIndex == position

10
app/src/main/java/com/github/libretube/ui/fragments/PlayerFragment.kt
View File

@ -934,17 +934,17 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
} }
// check if video has ended, next video is available and autoplay is enabled. // check if video has ended, next video is available and autoplay is enabled.
if ( if (playbackState == Player.STATE_ENDED) {
playbackState == Player.STATE_ENDED && if (!isTransitioning && PlayerHelper.autoPlayEnabled) {
!isTransitioning &&
PlayerHelper.autoPlayEnabled
) {
isTransitioning = true isTransitioning = true
if (PlayerHelper.autoPlayCountdown) { if (PlayerHelper.autoPlayCountdown) {
showAutoPlayCountdown() showAutoPlayCountdown()
} else { } else {
playNextVideo() playNextVideo()
} }
} else {
binding.player.showController()
}
} }
if (playbackState == Player.STATE_READY) { if (playbackState == Player.STATE_READY) {