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

Merge pull request #4556 from Isira-Seneviratne/Enum_serializable

Browse Source 
refactor: Simplify player event handling
This commit is contained in:
Isira Seneviratne 2023-08-20 12:44:15 +05:30 committed by GitHub
commit 0e8e6278d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/com/github/libretube/enums/PlayerEvent.kt
View File

@ -1,16 +1,11 @@
package com.github.libretube.enums package com.github.libretube.enums
enum class PlayerEvent(val value: Int) { enum class PlayerEvent {
Pause(0), Pause,
Play(1), Play,
Forward(2), Forward,
Rewind(3), Rewind,
Next(5), Next,
Prev(6), Prev,
Background(7) Background
;
companion object {
fun fromInt(value: Int) = PlayerEvent.values().first { it.value == value }
}
} }

17
app/src/main/java/com/github/libretube/extensions/Intent.kt
View File

@ -2,8 +2,21 @@ package com.github.libretube.extensions
import android.content.Intent import android.content.Intent
import android.os.Parcelable import android.os.Parcelable
import androidx.annotation.OptIn
import androidx.core.content.IntentCompat import androidx.core.content.IntentCompat
import androidx.core.os.BuildCompat
import java.io.Serializable
inline fun <reified T : Parcelable> Intent.parcelableExtra(key: String?): T? { inline fun <reified T : Parcelable> Intent.parcelableExtra(name: String?): T? {
return IntentCompat.getParcelableExtra(this, key, T::class.java) return IntentCompat.getParcelableExtra(this, name, T::class.java)
}
@OptIn(BuildCompat.PrereleaseSdkCheck::class)
inline fun <reified T : Serializable> Intent.serializableExtra(name: String?): T? {
return if (BuildCompat.isAtLeastU()) {
getSerializableExtra(name, T::class.java)
} else {
@Suppress("DEPRECATION")
getSerializableExtra(name) as? T
}
} }

10
app/src/main/java/com/github/libretube/helpers/PlayerHelper.kt
View File

@ -350,13 +350,13 @@ object PlayerHelper {
} }
} }
fun getIntentActon(context: Context): String { fun getIntentAction(context: Context): String {
return context.packageName + "." + ACTION_MEDIA_CONTROL return context.packageName + "." + ACTION_MEDIA_CONTROL
} }
private fun getPendingIntent(activity: Activity, code: Int): PendingIntent { private fun getPendingIntent(activity: Activity, event: PlayerEvent): PendingIntent {
val intent = Intent(getIntentActon(activity)).putExtra(CONTROL_TYPE, code) val intent = Intent(getIntentAction(activity)).putExtra(CONTROL_TYPE, event)
return PendingIntentCompat.getBroadcast(activity, code, intent, 0, false) return PendingIntentCompat.getBroadcast(activity, event.ordinal, intent, 0, false)
} }
private fun getRemoteAction( private fun getRemoteAction(
@ -370,7 +370,7 @@ object PlayerHelper {
IconCompat.createWithResource(activity, id), IconCompat.createWithResource(activity, id),
text, text,
text, text,
getPendingIntent(activity, event.value) getPendingIntent(activity, event)
) )
} }

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

@ -75,6 +75,7 @@ import com.github.libretube.extensions.formatShort
import com.github.libretube.extensions.hideKeyboard import com.github.libretube.extensions.hideKeyboard
import com.github.libretube.extensions.parcelable import com.github.libretube.extensions.parcelable
import com.github.libretube.extensions.seekBy import com.github.libretube.extensions.seekBy
import com.github.libretube.extensions.serializableExtra
import com.github.libretube.extensions.setMetadata import com.github.libretube.extensions.setMetadata
import com.github.libretube.extensions.toID import com.github.libretube.extensions.toID
import com.github.libretube.extensions.toastFromMainDispatcher import com.github.libretube.extensions.toastFromMainDispatcher
@ -204,9 +205,8 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
* Receiver for all actions in the PiP mode * Receiver for all actions in the PiP mode
*/ */
private val broadcastReceiver = object : BroadcastReceiver() { private val broadcastReceiver = object : BroadcastReceiver() {
override fun onReceive(context: Context?, intent: Intent?) { override fun onReceive(context: Context, intent: Intent) {
val action = intent?.getIntExtra(PlayerHelper.CONTROL_TYPE, 0) ?: return when (intent.serializableExtra<PlayerEvent>(PlayerHelper.CONTROL_TYPE) ?: return) {
when (PlayerEvent.fromInt(action)) {
PlayerEvent.Play -> { PlayerEvent.Play -> {
exoPlayer.play() exoPlayer.play()
} }
@ -252,7 +252,7 @@ class PlayerFragment : Fragment(), OnlinePlayerOptions {
// broadcast receiver for PiP actions // broadcast receiver for PiP actions
context?.registerReceiver( context?.registerReceiver(
broadcastReceiver, broadcastReceiver,
IntentFilter(PlayerHelper.getIntentActon(requireContext())) IntentFilter(PlayerHelper.getIntentAction(requireContext()))
) )
// schedule task to save the watch position each second // schedule task to save the watch position each second