Update ExternalPlayerActivity with service integration and UI controls

Author: osphvdhwj

external-player/src/main/java/org/newpipe/externalplayer/ExternalPlayerActivity.kt

@@ -6,19 +6,18 @@ import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.util.Rational
-import android.view.View
+import android.view.GestureDetector
+import android.view.MotionEvent
 import androidx.appcompat.app.AppCompatActivity
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.Player.STATE_READY
-import com.google.android.exoplayer2.SimpleExoPlayer
+import androidx.core.content.ContextCompat
 import org.newpipe.externalplayer.databinding.ActivityExternalPlayerBinding
 
 class ExternalPlayerActivity : AppCompatActivity() {
 
     private lateinit var binding: ActivityExternalPlayerBinding
-    private var player: SimpleExoPlayer? = null
-    private var playWhenReady = true
-    private var playbackPosition: Long = 0
+    private var serviceStarted = false
+    private val speeds = floatArrayOf(1.0f, 1.25f, 1.5f, 2.0f, 0.5f)
+    private var speedIndex = 0
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -27,8 +26,31 @@ class ExternalPlayerActivity : AppCompatActivity() {
 
         handleIncomingIntent(intent)
 
-        binding.enterPipButton.setOnClickListener {
-            enterPip()
+        binding.enterPipButton.setOnClickListener { enterPip() }
+        binding.speedButton.setOnClickListener {
+            speedIndex = (speedIndex + 1) % speeds.size
+            val speed = speeds[speedIndex]
+            binding.speedButton.text = "${speed}x"
+            val intent = Intent(this, PlayerService::class.java).apply {
+                action = PlayerService.ACTION_PLAY
+                putExtra("speed", speed)
+            }
+            ContextCompat.startForegroundService(this, intent)
+        }
+        binding.subToggle.setOnClickListener {
+            val newText = if (binding.subToggle.text == "SUB") "SUB:OFF" else "SUB"
+            binding.subToggle.text = newText
+        }
+
+        val gestureDetector = GestureDetector(this, object : GestureDetector.SimpleOnGestureListener() {
+            override fun onScroll(e1: MotionEvent?, e2: MotionEvent?, distanceX: Float, distanceY: Float): Boolean {
+                return super.onScroll(e1, e2, distanceX, distanceY)
+            }
+        })
+
+        binding.playerView.setOnTouchListener { _, event ->
+            gestureDetector.onTouchEvent(event)
+            false
         }
     }
 
@@ -39,37 +61,29 @@ class ExternalPlayerActivity : AppCompatActivity() {
         if (Intent.ACTION_VIEW == action || data != null) {
             data?.let { uri ->
                 binding.urlText.text = uri.toString()
-                initializePlayer(uri.toString())
+                startServiceWithUri(uri.toString())
             }
         } else if (Intent.ACTION_SEND == action) {
             val text = intent.getStringExtra(Intent.EXTRA_TEXT) ?: intent.getStringExtra(Intent.EXTRA_STREAM)?.toString()
             text?.let {
                 val url = extractUrlFromText(it)
-                if (url != null) initializePlayer(url)
+                if (url != null) startServiceWithUri(url)
             }
         }
     }
 
-    private fun extractUrlFromText(text: String): String? {
-        val regex = "(https?://[\w\-._~:/?#[\]@!$&'()*+,;=%]+)".toRegex()
-        return regex.find(text)?.value
+    private fun startServiceWithUri(uri: String) {
+        val intent = Intent(this, PlayerService::class.java).apply {
+            action = PlayerService.ACTION_SET_URI
+            putExtra(PlayerService.EXTRA_URI, uri)
+        }
+        ContextCompat.startForegroundService(this, intent)
+        serviceStarted = true
     }
 
-    private fun initializePlayer(url: String) {
-        if (player == null) {
-            player = SimpleExoPlayer.Builder(this).build()
-            binding.playerView.player = player
-        }
-        val mediaItem = MediaItem.fromUri(Uri.parse(url))
-        player!!.setMediaItem(mediaItem)
-        player!!.playWhenReady = playWhenReady
-        player!!.seekTo(playbackPosition)
-        player!!.prepare()
-        player!!.addListener(object : com.google.android.exoplayer2.Player.Listener {
-            override fun onPlaybackStateChanged(state: Int) {
-                binding.loadingView.visibility = if (state == STATE_READY) View.GONE else View.VISIBLE
-            }
-        })
+    private fun extractUrlFromText(text: String): String? {
+        val regex = "(https?://[\\w\\-._~:/?#[\\]@!$&'()*+,;=%]+)".toRegex()
+        return regex.find(text)?.value
     }
 
     private fun enterPip() {
@@ -87,39 +101,4 @@ class ExternalPlayerActivity : AppCompatActivity() {
             enterPip()
         }
     }
-
-    override fun onPause() {
-        super.onPause()
-        player?.let {
-            playbackPosition = it.currentPosition
-            playWhenReady = it.playWhenReady
-            it.playWhenReady = false
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        player?.playWhenReady = playWhenReady
-    }
-
-    override fun onStop() {
-        super.onStop()
-        if (!isInPictureInPictureMode) {
-            releasePlayer()
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        releasePlayer()
-    }
-
-    private fun releasePlayer() {
-        player?.let {
-            playbackPosition = it.currentPosition
-            playWhenReady = it.playWhenReady
-            it.release()
-            player = null
-        }
-    }
 }