kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2024-12-14 14:20:30 +05:30
Code Issues Projects Releases Wiki Activity

animations

Browse Source
This commit is contained in:
Bnyro 2022-06-29 16:07:58 +02:00
parent 787ed2acc4
commit 19a46a19c0
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -166,8 +166,9 @@ class PlayerFragment : Fragment() {
hideKeyboard() hideKeyboard()
setSponsorBlockPrefs() setSponsorBlockPrefs()
createExoPlayer(view)
initializeTransitionLayout(view) initializeTransitionLayout(view)
fetchJsonAndInitPlayer(view) playVideo(view)
} }
private fun initializeTransitionLayout(view: View) { private fun initializeTransitionLayout(view: View) {
@ -267,7 +268,7 @@ class PlayerFragment : Fragment() {
val descLinLayout = view.findViewById<LinearLayout>(R.id.desc_linLayout) val descLinLayout = view.findViewById<LinearLayout>(R.id.desc_linLayout)
view.findViewById<RelativeLayout>(R.id.player_title_layout).setOnClickListener { view.findViewById<RelativeLayout>(R.id.player_title_layout).setOnClickListener {
val arrowImageView = view.findViewById<ImageView>(R.id.player_description_arrow) val arrowImageView = view.findViewById<ImageView>(R.id.player_description_arrow)
arrowImageView.animate().rotationBy(180F).setDuration(100).start() arrowImageView.animate().rotationBy(180F).setDuration(250).start()
descLinLayout.visibility = if (descLinLayout.isVisible) View.GONE else View.VISIBLE descLinLayout.visibility = if (descLinLayout.isVisible) View.GONE else View.VISIBLE
} }
@ -384,7 +385,12 @@ class PlayerFragment : Fragment() {
val isScreenOn = pm.isInteractive val isScreenOn = pm.isInteractive
// pause player if screen off and setting enabled // pause player if screen off and setting enabled
if (exoPlayer != null && !isScreenOn && pausePlayerOnScreenOffEnabled) { if (
this::exoPlayer.isInitialized &&
exoPlayer != null &&
!isScreenOn &&
pausePlayerOnScreenOffEnabled
) {
exoPlayer.pause() exoPlayer.pause()
} }
super.onPause() super.onPause()
@ -428,7 +434,7 @@ class PlayerFragment : Fragment() {
} }
} }
private fun fetchJsonAndInitPlayer(view: View) { private fun playVideo(view: View) {
fun run() { fun run() {
lifecycleScope.launchWhenCreated { lifecycleScope.launchWhenCreated {
val response = try { val response = try {
@ -456,7 +462,6 @@ class PlayerFragment : Fragment() {
relatedStreams = response.relatedStreams relatedStreams = response.relatedStreams
runOnUiThread { runOnUiThread {
createExoPlayer(view)
if (response.chapters != null) initializeChapters(response.chapters) if (response.chapters != null) initializeChapters(response.chapters)
// set media sources for the player // set media sources for the player
setResolutionAndSubtitles(view, response) setResolutionAndSubtitles(view, response)
@ -542,7 +547,7 @@ class PlayerFragment : Fragment() {
if (videoId != nextStreamId) { if (videoId != nextStreamId) {
// save the id of the next stream as videoId and load the next video // save the id of the next stream as videoId and load the next video
videoId = nextStreamId videoId = nextStreamId
fetchJsonAndInitPlayer(view!!) playVideo(view!!)
} }
} }
@ -571,7 +576,7 @@ class PlayerFragment : Fragment() {
private fun fetchSponsorBlockSegments() { private fun fetchSponsorBlockSegments() {
fun run() { fun run() {
lifecycleScope.launchWhenCreated { lifecycleScope.launch(Dispatchers.IO) {
if (sponsorBlockPrefs.sponsorBlockEnabled) { if (sponsorBlockPrefs.sponsorBlockEnabled) {
val categories: ArrayList<String> = arrayListOf() val categories: ArrayList<String> = arrayListOf()
if (sponsorBlockPrefs.introEnabled) { if (sponsorBlockPrefs.introEnabled) {
@ -607,14 +612,10 @@ class PlayerFragment : Fragment() {
} catch (e: IOException) { } catch (e: IOException) {
println(e) println(e)
Log.e(TAG, "IOException, you might not have internet connection") Log.e(TAG, "IOException, you might not have internet connection")
Toast.makeText(context, R.string.unknown_error, Toast.LENGTH_SHORT) return@launch
.show()
return@launchWhenCreated
} catch (e: HttpException) { } catch (e: HttpException) {
Log.e(TAG, "HttpException, unexpected response") Log.e(TAG, "HttpException, unexpected response")
Toast.makeText(context, R.string.server_error, Toast.LENGTH_SHORT) return@launch
.show()
return@launchWhenCreated
} }
} }
} }