Changed folder structure

StreamAMG · Mar 7, 2024 · cc382ef · cc382ef
1 parent ae6f449
commit cc382ef
Show file tree

Hide file tree

Showing 15 changed files with 25 additions and 13 deletions.
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/app/src/main/java/com/streamamg/playback_sdk_android_app/CustomVideoPlayerPlugin.kt b/app/src/main/java/com/streamamg/playback_sdk_android_app/CustomVideoPlayerPlugin.kt
@@ -9,7 +9,7 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.viewinterop.AndroidView
-import com.streamamg.VideoPlayerPlugin
+import com.streamamg.player.plugin.VideoPlayerPlugin
 
 class NativeMediaPlayerPlugin : VideoPlayerPlugin {
     private var mediaPlayer: MediaPlayer? = null

diff --git a/app/src/main/java/com/streamamg/playback_sdk_android_app/MainActivity.kt b/app/src/main/java/com/streamamg/playback_sdk_android_app/MainActivity.kt
@@ -15,11 +15,11 @@ import androidx.compose.material3.Text
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import com.streamamg.BitmovinVideoPlayerPlugin
 import com.streamamg.PlayBackSDKManager
 import com.streamamg.PlayBackSDKManager.loadPlayer
-import com.streamamg.VideoPlayerPluginManager
+import com.streamamg.player.plugin.VideoPlayerPluginManager
 import com.streamamg.playback_sdk_android_app.ui.theme.PlaybacksdkandroidTheme
+import com.streamamg.player.plugin.bitmovin.BitmovinVideoPlayerPlugin
 
 class MainActivity : ComponentActivity() {
 
@@ -31,7 +31,8 @@ class MainActivity : ComponentActivity() {
         PlayBackSDKManager.initialize(apiKey) { _, _ -> }
 
         // Register plugin
-        val customPlugin = NativeMediaPlayerPlugin()
+        //val customPlugin = NativeMediaPlayerPlugin()
+        val customPlugin = BitmovinVideoPlayerPlugin()
         VideoPlayerPluginManager.registerPlugin(customPlugin)
 
         val entryId = "0_qt9cy11s"

diff --git a/playback-sdk-android/src/main/java/com/streamamg/PlayBackSDKManager.kt b/playback-sdk-android/src/main/java/com/streamamg/PlayBackSDKManager.kt
@@ -4,8 +4,9 @@ import PlayerInformationAPI
 import PlayerInformationAPIService
 import android.util.Log
 import androidx.compose.runtime.Composable
-import com.streamamg.playbacksdk.playbackapi.PlayBackAPI
-import com.streamamg.playbacksdk.playbackapi.PlayBackAPIService
+import com.streamamg.api.player.PlayBackAPI
+import com.streamamg.api.player.PlayBackAPIService
+import com.streamamg.player.ui.PlaybackUIView
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope

diff --git a/...laybackapi/PlayerInformationAPIService.kt → ...figuration/PlayerInformationAPIService.kt b/...laybackapi/PlayerInformationAPIService.kt → ...figuration/PlayerInformationAPIService.kt
diff --git a/...mg/playbacksdk/playbackapi/PlayBackAPI.kt → ...a/com/streamamg/api/player/PlayBackAPI.kt b/...mg/playbacksdk/playbackapi/PlayBackAPI.kt → ...a/com/streamamg/api/player/PlayBackAPI.kt
@@ -1,4 +1,4 @@
-package com.streamamg.playbacksdk.playbackapi
+package com.streamamg.api.player
 
 import kotlinx.coroutines.flow.Flow
 

diff --git a/...backsdk/playbackapi/PlayBackAPIService.kt → ...treamamg/api/player/PlayBackAPIService.kt b/...backsdk/playbackapi/PlayBackAPIService.kt → ...treamamg/api/player/PlayBackAPIService.kt
@@ -1,4 +1,4 @@
-package com.streamamg.playbacksdk.playbackapi
+package com.streamamg.api.player
 
 import com.streamamg.PlayBackAPIError
 import com.streamamg.PlayBackSDKManager

diff --git a/...ksdk/playbackapi/PlaybackResponseModel.kt → ...amamg/api/player/PlaybackResponseModel.kt b/...ksdk/playbackapi/PlaybackResponseModel.kt → ...amamg/api/player/PlaybackResponseModel.kt
@@ -1,4 +1,4 @@
-package com.streamamg.playbacksdk.playbackapi
+package com.streamamg.api.player
 
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable

diff --git a/...n/java/com/streamamg/VideoPlayerPlugin.kt → ...eamamg/player/plugin/VideoPlayerPlugin.kt b/...n/java/com/streamamg/VideoPlayerPlugin.kt → ...eamamg/player/plugin/VideoPlayerPlugin.kt
@@ -1,4 +1,4 @@
-package com.streamamg
+package com.streamamg.player.plugin
 
 import android.view.View
 import androidx.compose.runtime.Composable

diff --git a/...com/streamamg/VideoPlayerPluginManager.kt → ...player/plugin/VideoPlayerPluginManager.kt b/...com/streamamg/VideoPlayerPluginManager.kt → ...player/plugin/VideoPlayerPluginManager.kt
@@ -1,4 +1,4 @@
-package com.streamamg
+package com.streamamg.player.plugin
 
 object VideoPlayerPluginManager {
     internal var selectedPlugin: VideoPlayerPlugin? = null

diff --git a/.../java/com/streamamg/BitmovinPlayerView.kt → ...yer/plugin/bitmovin/BitmovinPlayerView.kt b/.../java/com/streamamg/BitmovinPlayerView.kt → ...yer/plugin/bitmovin/BitmovinPlayerView.kt
diff --git a/...va/com/streamamg/BitmovinPlayerWrapper.kt → .../plugin/bitmovin/BitmovinPlayerWrapper.kt b/...va/com/streamamg/BitmovinPlayerWrapper.kt → .../plugin/bitmovin/BitmovinPlayerWrapper.kt
diff --git a/...om/streamamg/BitmovinVideoPlayerPlugin.kt → ...gin/bitmovin/BitmovinVideoPlayerPlugin.kt b/...om/streamamg/BitmovinVideoPlayerPlugin.kt → ...gin/bitmovin/BitmovinVideoPlayerPlugin.kt
@@ -1,4 +1,4 @@
-package com.streamamg
+package com.streamamg.player.plugin.bitmovin
 
 import android.view.View
 import androidx.compose.foundation.layout.Box
@@ -11,6 +11,7 @@ import com.bitmovin.player.api.source.Source
 import com.bitmovin.player.api.source.SourceConfig
 import com.bitmovin.player.api.source.SourceType
 import com.streamamg.playback_sdk_android.R
+import com.streamamg.player.plugin.VideoPlayerPlugin
 
 
 class BitmovinVideoPlayerPlugin : VideoPlayerPlugin {

diff --git a/...main/java/com/streamamg/PlaybackUIView.kt → ...com/streamamg/player/ui/PlaybackUIView.kt b/...main/java/com/streamamg/PlaybackUIView.kt → ...com/streamamg/player/ui/PlaybackUIView.kt
@@ -1,8 +1,11 @@
-package com.streamamg
+package com.streamamg.player.ui
 
 import androidx.compose.runtime.Composable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.runtime.*
+import com.streamamg.PlayBackAPIError
+import com.streamamg.PlayBackSDKManager
+import com.streamamg.player.plugin.VideoPlayerPluginManager
 
 internal class PlaybackUIView(
     private val entryId: String,

diff --git a/...src/main/java/com/streamamg/PlayerView.kt → ...ava/com/streamamg/player/ui/PlayerView.kt b/...src/main/java/com/streamamg/PlayerView.kt → ...ava/com/streamamg/player/ui/PlayerView.kt