[ISSUE-68] Adding Youtube player instead of exoplayer shit

gabrielbmoro · gabrielbmoro · commit a67d92b00c99 · 2023-07-11T09:56:08.000-03:00
diff --git a/core-shared-ui/build.gradle.kts b/core-shared-ui/build.gradle.kts
@@ -8,6 +8,6 @@ dependencies {
     implementation(libs.bundles.koin)
     implementation(libs.bundles.kotlin)
     implementation(libs.bundles.androidSupport)
-    implementation(libs.bundles.media3)
+    implementation(libs.android.youtube.player)
     testImplementation(libs.bundles.test)
 }
diff --git a/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.kt b/core-shared-ui/src/main/java/com/codandotv/streamplayerapp/core_shared_ui/widget/PlayerComponent.kt
@@ -13,28 +13,68 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
-import androidx.media3.common.MediaItem
-import androidx.media3.exoplayer.ExoPlayer
-import androidx.media3.ui.PlayerView
 import com.codandotv.streamplayerapp.core_shared_ui.theme.ThemePreviews
+import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.PlayerConstants
+import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.YouTubePlayer
+import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.listeners.YouTubePlayerListener
+import com.pierfrancescosoffritti.androidyoutubeplayer.core.player.views.YouTubePlayerView
 
 @Composable
-fun PlayerComponent(url: String, modifier: Modifier = Modifier) {
+fun PlayerComponent(videoId: String, modifier: Modifier = Modifier) {
+
     val context = LocalContext.current
 
-    val exoplayer = remember {
-        val mediaItem = MediaItem.Builder()
-            .setUri(url)
-            .build()
+    val youtubePlayerView = remember {
+        YouTubePlayerView(context).apply {
+            enableAutomaticInitialization = false
+
+            addYouTubePlayerListener(object : YouTubePlayerListener {
+                override fun onApiChange(youTubePlayer: YouTubePlayer) {}
+
+                override fun onCurrentSecond(youTubePlayer: YouTubePlayer, second: Float) {}
+
+                override fun onError(
+                    youTubePlayer: YouTubePlayer,
+                    error: PlayerConstants.PlayerError
+                ) {
+                }
+
+                override fun onPlaybackQualityChange(
+                    youTubePlayer: YouTubePlayer,
+                    playbackQuality: PlayerConstants.PlaybackQuality
+                ) {
+                }
+
+                override fun onPlaybackRateChange(
+                    youTubePlayer: YouTubePlayer,
+                    playbackRate: PlayerConstants.PlaybackRate
+                ) {
+                }
+
+                override fun onReady(youTubePlayer: YouTubePlayer) {
+                    youTubePlayer.loadVideo(videoId, 0f)
+                }
+
+                override fun onStateChange(
+                    youTubePlayer: YouTubePlayer,
+                    state: PlayerConstants.PlayerState
+                ) {
+                }
+
+                override fun onVideoDuration(youTubePlayer: YouTubePlayer, duration: Float) {}
 
-        ExoPlayer.Builder(context).build().apply {
-            setMediaItem(mediaItem)
-            prepare()
+                override fun onVideoId(youTubePlayer: YouTubePlayer, videoId: String) {}
 
-            playWhenReady = true
+                override fun onVideoLoadedFraction(
+                    youTubePlayer: YouTubePlayer,
+                    loadedFraction: Float
+                ) {
+                }
+            })
         }
     }
 
+
     Column(
         modifier = modifier
             .fillMaxSize()
@@ -46,27 +86,25 @@ fun PlayerComponent(url: String, modifier: Modifier = Modifier) {
                     .height(200.dp)
                     .align(Alignment.TopCenter),
                 factory = {
-                    PlayerView(it).apply {
-                        player = exoplayer
-                        useController = true
-                    }
+                    youtubePlayerView
                 }
             )
         }
     }
 
-    DisposableEffect(key1 = Unit, effect = {
-        onDispose {
-            exoplayer.release()
-        }
-    })
+    DisposableEffect(
+        key1 = Unit,
+        effect = {
+            onDispose { youtubePlayerView.release() }
+        },
+    )
 }
 
 @Composable
 @ThemePreviews
 fun PlayerComponentPreview() {
     PlayerComponent(
-        url = "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",
+        videoId = "BigBuckBunny.mp4",
         modifier = Modifier.fillMaxWidth()
     )
 }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/DetailStreamMapper.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/DetailStreamMapper.kt
@@ -17,7 +17,7 @@ fun DetailStreamResponse.toDetailStream(): DetailStream =
 fun VideoStreamsResponse.toVideoStreams(): List<VideoStream> =
     results.map {
         VideoStream(
-            youtubeUrl = "http://youtube.com/watch?v=".plus(it.key),
+            videoId = it.key,
             movieId = this.id
         )
     }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/VideoStream.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/domain/VideoStream.kt
@@ -2,5 +2,5 @@ package com.codandotv.streamplayerapp.feature_list_streams.detail.domain
 
 data class VideoStream(
     val movieId: Long,
-    val youtubeUrl: String,
+    val videoId: String,
 )
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamViewModel.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamViewModel.kt
@@ -37,7 +37,7 @@ class DetailStreamViewModel(
                 .zip(videoStreamsUseCase.getVideoStreams()) { detailStream, videoUrl ->
                     DetailStreamsLoadedUIState(
                         detailStream = detailStream,
-                        videoUrl = videoUrl.firstOrNull()?.youtubeUrl
+                        videoId = videoUrl.firstOrNull()?.videoId
                     )
                 }
                 .onStart { onLoading() }
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamsUIState.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/screens/DetailStreamsUIState.kt
@@ -5,7 +5,7 @@ import com.codandotv.streamplayerapp.feature_list_streams.detail.domain.DetailSt
 sealed class DetailStreamsUIState {
     data class DetailStreamsLoadedUIState(
         val detailStream: DetailStream,
-        val videoUrl: String?,
+        val videoId: String?,
     ) : DetailStreamsUIState()
 
     object LoadingStreamUIState : DetailStreamsUIState()
diff --git a/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/widget/DetailStreamImagePreview.kt b/feature-list-streams/src/main/java/com/codandotv/streamplayerapp/feature_list_streams/detail/presentation/widget/DetailStreamImagePreview.kt
@@ -35,7 +35,7 @@ fun DetailStreamImagePreview(
     ) {
         if (showPlayer) {
             PlayerComponent(
-                url = "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"
+                videoId = uiState.videoId ?: ""
             )
         } else {
             AsyncImage(
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -42,7 +42,7 @@ compose_pagging="1.0.0-alpha20"
 coil = "2.3.0"
 lottie = "5.2.0"
 
-media3 = "1.1.0"
+android_youtube_player_version = "12.0.0"
 
 [libraries]
 kotlin_gradle_plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -111,8 +111,7 @@ moshi_converter = { group = "com.squareup.retrofit2", name = "converter-moshi",
 okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
 interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }
 
-media3_base = { group = "androidx.media3", name = "media3-exoplayer", version.ref = "media3"}
-media3_ui = { group = "androidx.media3", name = "media3-ui", version.ref = "media3"}
+android_youtube_player = { group = "com.pierfrancescosoffritti.androidyoutubeplayer", name = "core", version.ref = "android_youtube_player_version" }
 
 [bundles]
 compose = ["compose.ui", "compose.icons", "compose.material3","compose_pagging", "compose.lifecycle", "compose.navigation", "compose.activity", "compose.ui.tooling"]
@@ -122,7 +121,6 @@ koin = ["koin_android", "koin_compose"]
 test = ["junit", "mockk", "mockk_android", "viewmodel_test", "koin_test"]
 androidSupport = ["androidx_core", "androidx_appcompat", "androidx_dynamicanimation","google_material"]
 kotlin = ["androidx_core", "kotlin_stdlib", "kotlin_reflect"]
-media3 = ["media3_base", "media3_ui"]
 
 [plugins]
 android_application = { id = "com.android.application", version.ref = "android_gradle_plugin" }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@ dependencies {`
`8`	`8`	`implementation(libs.bundles.koin)`
`9`	`9`	`implementation(libs.bundles.kotlin)`
`10`	`10`	`implementation(libs.bundles.androidSupport)`
`11`		`- implementation(libs.bundles.media3)`
	`11`	`+ implementation(libs.android.youtube.player)`
`12`	`12`	`testImplementation(libs.bundles.test)`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ fun DetailStreamResponse.toDetailStream(): DetailStream =`
`17`	`17`	`fun VideoStreamsResponse.toVideoStreams(): List<VideoStream> =`
`18`	`18`	`results.map {`
`19`	`19`	`VideoStream(`
`20`		`- youtubeUrl = "http://youtube.com/watch?v=".plus(it.key),`
	`20`	`+ videoId = it.key,`
`21`	`21`	`movieId = this.id`
`22`	`22`	`)`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ package com.codandotv.streamplayerapp.feature_list_streams.detail.domain`
`2`	`2`
`3`	`3`	`data class VideoStream(`
`4`	`4`	`val movieId: Long,`
`5`		`- val youtubeUrl: String,`
	`5`	`+ val videoId: String,`
`6`	`6`	`)`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class DetailStreamViewModel(`
`37`	`37`	`.zip(videoStreamsUseCase.getVideoStreams()) { detailStream, videoUrl ->`
`38`	`38`	`DetailStreamsLoadedUIState(`
`39`	`39`	`detailStream = detailStream,`
`40`		`- videoUrl = videoUrl.firstOrNull()?.youtubeUrl`
	`40`	`+ videoId = videoUrl.firstOrNull()?.videoId`
`41`	`41`	`)`
`42`	`42`	`}`
`43`	`43`	`.onStart { onLoading() }`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ fun DetailStreamImagePreview(`
`35`	`35`	`) {`
`36`	`36`	`if (showPlayer) {`
`37`	`37`	`PlayerComponent(`
`38`		`- url = "https://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4"`
	`38`	`+ videoId = uiState.videoId ?: ""`
`39`	`39`	`)`
`40`	`40`	`} else {`
`41`	`41`	`AsyncImage(`