From e77a87f257b7546fecbcd0f5475fb93855e81259 Mon Sep 17 00:00:00 2001
From: Shahid Iqbal <shahid.iqbal4213@gmail.com>
Date: Sat, 3 Aug 2024 19:18:17 +0500
Subject: [PATCH] Update App Modification

---
 .idea/misc.xml                                |  1 -
 .../gulehri/samplereelsapp/MainActivity.kt    |  4 +-
 gradle/libs.versions.toml                     |  6 +-
 .../reelsplayer/actions/PlayerResizeMode.kt   |  2 -
 .../iqbal/reelsplayer/actions/RepeatMode.kt   |  2 -
 .../actions/ThumbnailDisplayMode.kt           |  3 -
 .../reelsplayer/actions/VideoScalingMode.kt   |  2 -
 .../reelsplayer/components/ReelsPlayer.kt     | 56 ++++++-------------
 .../iqbal/reelsplayer/configs/ReelsConfig.kt  | 14 ++---
 .../reelsplayer/configs/ReelsConfigUtils.kt   |  5 +-
 10 files changed, 33 insertions(+), 62 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 50e6e99..31a6708 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
diff --git a/app/src/main/java/com/gulehri/samplereelsapp/MainActivity.kt b/app/src/main/java/com/gulehri/samplereelsapp/MainActivity.kt
index 74b1d81..fe50692 100644
--- a/app/src/main/java/com/gulehri/samplereelsapp/MainActivity.kt
+++ b/app/src/main/java/com/gulehri/samplereelsapp/MainActivity.kt
@@ -27,7 +27,9 @@ class MainActivity : ComponentActivity() {
                             .padding(innerPadding),
                         videoList = listOf(
                             "https://vue-3-tiktok.vercel.app/video1.mp4",
-                            "https://vue-3-tiktok.vercel.app/video2.mp4"
+                            "https://vue-3-tiktok.vercel.app/video2.mp4",
+                            "https://i.imgur.com/rzhgpNQ.mp4",
+                            "https://www.instagram.com/reel/C82D-F4vNNv/?igsh=aGwzb3pteG45OGl2",
                         ),
                         indexOfVideo = 0,
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 4d1b8db..f63194b 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ espressoCore = "3.6.1"
 lifecycleRuntimeKtx = "2.8.3"
 activityCompose = "1.9.0"
 composeBom = "2024.06.00"
-exoplayer = "1.3.1"
+exoplayer = "1.4.0"
 
 
 
@@ -34,9 +34,11 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3"
 media-exoplayer = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "exoplayer" }
 media-ui = { group = "androidx.media3", name = "media3-ui", version.ref = "exoplayer" }
 media-common = { group = "androidx.media3", name = "media3-common", version.ref = "exoplayer" }
+media-hls = { module = "androidx.media3:media3-exoplayer-hls", version.ref = "exoplayer" }
+
 
 [bundles]
-media3Exoplayer = ["media-exoplayer", "media-ui", "media-common"]
+media3Exoplayer = ["media-exoplayer", "media-ui", "media-hls", "media-common"]
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
diff --git a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/PlayerResizeMode.kt b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/PlayerResizeMode.kt
index 6901edb..475ad61 100644
--- a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/PlayerResizeMode.kt
+++ b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/PlayerResizeMode.kt
@@ -1,6 +1,5 @@
 package com.shahid.iqbal.reelsplayer.actions
 
-import androidx.compose.runtime.Stable
 import com.shahid.iqbal.reelsplayer.actions.PlayerResizeMode.FILL
 import com.shahid.iqbal.reelsplayer.actions.PlayerResizeMode.FIT
 import com.shahid.iqbal.reelsplayer.actions.PlayerResizeMode.FIXED_HEIGHT
@@ -21,7 +20,6 @@ import com.shahid.iqbal.reelsplayer.actions.PlayerResizeMode.ZOOM
  * @property FIXED_HEIGHT Maintains a fixed height for the video, adjusting the width to maintain aspect ratio.
  */
 
-@Stable
 enum class PlayerResizeMode {
     FIT, FILL, ZOOM, FIXED_WIDTH, FIXED_HEIGHT
 }
diff --git a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/RepeatMode.kt b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/RepeatMode.kt
index 73f12b9..cd7e4f4 100644
--- a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/RepeatMode.kt
+++ b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/RepeatMode.kt
@@ -1,6 +1,5 @@
 package com.shahid.iqbal.reelsplayer.actions
 
-import androidx.compose.runtime.Stable
 import com.shahid.iqbal.reelsplayer.actions.RepeatMode.ALL
 import com.shahid.iqbal.reelsplayer.actions.RepeatMode.CURRENT
 
@@ -11,7 +10,6 @@ import com.shahid.iqbal.reelsplayer.actions.RepeatMode.CURRENT
  * @property ALL Plays all videos in the list sequentially and repeats from the beginning when the end is reached.
  */
 
-@Stable
 enum class RepeatMode {
     CURRENT,
     ALL
diff --git a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/ThumbnailDisplayMode.kt b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/ThumbnailDisplayMode.kt
index 2ff0a6a..9270f7c 100644
--- a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/ThumbnailDisplayMode.kt
+++ b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/ThumbnailDisplayMode.kt
@@ -1,6 +1,5 @@
 package com.shahid.iqbal.reelsplayer.actions
 
-import androidx.compose.runtime.Stable
 import com.shahid.iqbal.reelsplayer.actions.ThumbnailDisplayMode.FILL
 import com.shahid.iqbal.reelsplayer.actions.ThumbnailDisplayMode.FIT
 import com.shahid.iqbal.reelsplayer.actions.ThumbnailDisplayMode.OFF
@@ -12,8 +11,6 @@ import com.shahid.iqbal.reelsplayer.actions.ThumbnailDisplayMode.OFF
  * @property FIT Thumbnails are scaled to fit within the display area, maintaining aspect ratio.
  * @property FILL Thumbnails are scaled to fill the display area, potentially cropping the image.
  */
-
-@Stable
 enum class ThumbnailDisplayMode {
     OFF, FIT, FILL
 }
diff --git a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/VideoScalingMode.kt b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/VideoScalingMode.kt
index e1d2019..35de28e 100644
--- a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/VideoScalingMode.kt
+++ b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/actions/VideoScalingMode.kt
@@ -1,6 +1,5 @@
 package com.shahid.iqbal.reelsplayer.actions
 
-import androidx.compose.runtime.Stable
 import com.shahid.iqbal.reelsplayer.actions.VideoScalingMode.DEFAULT
 import com.shahid.iqbal.reelsplayer.actions.VideoScalingMode.FIT
 import com.shahid.iqbal.reelsplayer.actions.VideoScalingMode.FIT_WITH_CROPPING
@@ -14,7 +13,6 @@ import com.shahid.iqbal.reelsplayer.actions.VideoScalingMode.FIT_WITH_CROPPING
  * @property FIT_WITH_CROPPING Scales the video to fill the player's bounds, which may involve cropping parts of the video.
  */
 
-@Stable
 enum class VideoScalingMode {
     DEFAULT, FIT, FIT_WITH_CROPPING
 }
diff --git a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/components/ReelsPlayer.kt b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/components/ReelsPlayer.kt
index d679885..9dd8f08 100644
--- a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/components/ReelsPlayer.kt
+++ b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/components/ReelsPlayer.kt
@@ -2,10 +2,7 @@ package com.shahid.iqbal.reelsplayer.components
 
 import androidx.annotation.OptIn
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.pager.VerticalPager
 import androidx.compose.foundation.pager.rememberPagerState
 import androidx.compose.runtime.Composable
@@ -14,13 +11,10 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.remember
-import androidx.compose.runtime.rememberUpdatedState
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.compose.LocalLifecycleOwner
@@ -29,12 +23,11 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.media3.common.MediaItem
 import androidx.media3.common.Player
 import androidx.media3.common.util.UnstableApi
+import androidx.media3.datasource.DefaultHttpDataSource
 import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.ui.PlayerView
+import androidx.media3.exoplayer.hls.HlsMediaSource
 import com.shahid.iqbal.reelsplayer.configs.ReelsConfig
 import com.shahid.iqbal.reelsplayer.configs.ReelsConfigUtils
-import com.shahid.iqbal.reelsplayer.configs.ReelsConfigUtils.hideControllersViews
-import com.shahid.iqbal.reelsplayer.configs.ReelsConfigUtils.setPlayerAttributes
 
 /*
  * Created by Shahid Iqbal on 7/20/2024.
@@ -62,10 +55,11 @@ fun ReelsPlayer(
     contentPadding: PaddingValues = PaddingValues(0.dp),
 ) {
     val context = LocalContext.current
+    val lifecycleOwner = LocalLifecycleOwner.current
+
     val playerViewModel: PlayerViewModel = viewModel()
     val playerUiState by playerViewModel.playerUiState.collectAsStateWithLifecycle()
 
-    val lifecycleOwner by rememberUpdatedState(newValue = LocalLifecycleOwner.current)
     val listOfVideos = remember { videoList }
     val index by remember { mutableIntStateOf(indexOfVideo) }
     val pageState = rememberPagerState(initialPage = index) { listOfVideos.size }
@@ -74,6 +68,7 @@ fun ReelsPlayer(
         ExoPlayer.Builder(context).build().apply {
             videoScalingMode = ReelsConfigUtils.getVideoScalingMode(reelConfig.videoScalingMode)
             repeatMode = ReelsConfigUtils.getVideoRepeatMode(reelConfig.repeatMode)
+            setHandleAudioBecomingNoisy(true)
             addListener(object : Player.Listener {
                 override fun onPlaybackStateChanged(playbackState: Int) {
                     when (playbackState) {
@@ -116,7 +111,12 @@ fun ReelsPlayer(
 
     LaunchedEffect(pageState.currentPage) {
         with(exoPlayer) {
-            setMediaItem(MediaItem.fromUri(videoList[pageState.currentPage]))
+            setMediaSource(
+                HlsMediaSource.Factory(DefaultHttpDataSource.Factory())
+                    .createMediaSource(
+                        MediaItem.Builder().setUri(videoList[pageState.currentPage]).build()
+                    )
+            )
             prepare()
         }
     }
@@ -141,36 +141,16 @@ fun ReelsPlayer(
         modifier = modifier,
         beyondBoundsPageCount = 0,
         pageSpacing = pageSpacing,
-
         contentPadding = contentPadding,
         key = { videoList[it] }) { page ->
 
-        Box(modifier = Modifier.fillMaxSize()) {
-
-            if (page == pageState.currentPage) {
-                AndroidView({ ctx ->
-                    PlayerView(ctx).apply {
-                        player = exoPlayer
-                        setPlayerAttributes(reelConfig)
-                        hideControllersViews()
-                    }
-                }, modifier = Modifier.fillMaxSize(),
-                    update = {
-                    exoPlayer.playWhenReady = true
-                    }, onRelease = {
-                        it.player = null
-                })
-
-                if (playerUiState.isLoading) {
-                    reelConfig.playerLoader?.invoke() ?: DefaultVideoLoader(
-                        modifier = Modifier
-                            .align(Alignment.Center)
-                            .size(30.dp)
-                    )
-                }
-            }
-        }
-
+        PageContent(
+            exoPlayer = exoPlayer,
+            page = page,
+            pagerState = pageState,
+            reelConfig = reelConfig,
+            isPlayerLoading = playerUiState.isLoading
+        )
     }
 }
 
diff --git a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/configs/ReelsConfig.kt b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/configs/ReelsConfig.kt
index c4c0f01..304a00a 100644
--- a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/configs/ReelsConfig.kt
+++ b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/configs/ReelsConfig.kt
@@ -27,13 +27,13 @@ import com.shahid.iqbal.reelsplayer.actions.VideoScalingMode
 @Stable
 @Keep
 data class ReelsConfig(
-    var playerResizeMode: PlayerResizeMode = PlayerResizeMode.FILL,
-    var videoScalingMode: VideoScalingMode = VideoScalingMode.FIT_WITH_CROPPING,
-    var repeatMode: RepeatMode = RepeatMode.CURRENT,
-    var thumbnailDisplayMode: ThumbnailDisplayMode = ThumbnailDisplayMode.FILL,
+    val playerResizeMode: PlayerResizeMode = PlayerResizeMode.FILL,
+    val videoScalingMode: VideoScalingMode = VideoScalingMode.FIT_WITH_CROPPING,
+    val repeatMode: RepeatMode = RepeatMode.CURRENT,
+    val thumbnailDisplayMode: ThumbnailDisplayMode = ThumbnailDisplayMode.FILL,
     val showControlsMenu: Boolean = false,
-    var playerSize: Size = Size(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT),
-    var reelDetail: (@Composable (Int) -> Unit)? = null,
-    var playerLoader: (@Composable () -> Unit)? = null,
+    val playerSize: Size = Size(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT),
+    val reelDetail: (@Composable (Int) -> Unit)? = null,
+    val playerLoader: (@Composable () -> Unit)? = null,
 )
 
diff --git a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/configs/ReelsConfigUtils.kt b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/configs/ReelsConfigUtils.kt
index 4b168cf..8c646bd 100644
--- a/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/configs/ReelsConfigUtils.kt
+++ b/reelsplayer/src/main/java/com/shahid/iqbal/reelsplayer/configs/ReelsConfigUtils.kt
@@ -1,4 +1,4 @@
-package com.shahid.iqbal.reelsplayer.configs;
+package com.shahid.iqbal.reelsplayer.configs
 
 import android.view.ViewGroup
 import androidx.annotation.OptIn
@@ -16,8 +16,6 @@ import com.shahid.iqbal.reelsplayer.actions.VideoScalingMode
  * Created by Shahid Iqbal on 7/20/2024.
  */
 
-
-
 @OptIn(UnstableApi::class)
 object ReelsConfigUtils {
 
@@ -71,5 +69,4 @@ object ReelsConfigUtils {
         artworkDisplayMode = getThumbnailDisplayMode(reelConfig.thumbnailDisplayMode)
     }
 
-
 }
\ No newline at end of file