Simplify getters by always throwing #347
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -11,11 +11,10 @@ import com.bitmovin.player.api.ui.ScalingMode | |||||
| import com.bitmovin.player.api.ui.UiConfig | ||||||
| import com.bitmovin.player.reactnative.converter.toRNPlayerViewConfigWrapper | ||||||
| import com.bitmovin.player.reactnative.converter.toRNStyleConfigWrapperFromPlayerConfig | ||||||
| import com.bitmovin.player.reactnative.extensions.customMessageHandlerModule | ||||||
| import com.bitmovin.player.reactnative.extensions.fullscreenHandlerModule | ||||||
| import com.bitmovin.player.reactnative.extensions.getBooleanOrNull | ||||||
| import com.bitmovin.player.reactnative.extensions.playerModule | ||||||
| import com.bitmovin.player.reactnative.ui.RNPictureInPictureHandler | ||||||
| import com.facebook.react.bridge.* | ||||||
| import com.facebook.react.module.annotations.ReactModule | ||||||
|
|
@@ -46,6 +45,7 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple | |||||
| override fun getName() = MODULE_NAME | ||||||
|
|
||||||
| private var customMessageHandlerBridgeId: NativeId? = null | ||||||
| private val handler = Handler(Looper.getMainLooper()) | ||||||
|
|
||||||
| /** | ||||||
| * The component's native view factory. RN may call this method multiple times | ||||||
|
|
@@ -181,53 +181,51 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple | |||||
| } | ||||||
|
|
||||||
| private fun attachFullscreenBridge(view: RNPlayerView, fullscreenBridgeId: NativeId) { | ||||||
| handler.postAndLogException { | ||||||
|
There was a problem hiding this comment. I think this is already in the |
||||||
| view.getPlayerViewOrThrow().setFullscreenHandler( | ||||||
| context.fullscreenHandlerModule.getInstance(fullscreenBridgeId), | ||||||
| ) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private fun setFullscreen(view: RNPlayerView, isFullscreenRequested: Boolean) { | ||||||
| handler.postAndLogException { | ||||||
| with(view.getPlayerViewOrThrow()) { | ||||||
| when { | ||||||
| isFullscreen == isFullscreenRequested -> Unit // No changes | ||||||
| isFullscreenRequested -> enterFullscreen() | ||||||
| !isFullscreenRequested -> exitFullscreen() | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private fun setPictureInPicture(view: RNPlayerView, isPictureInPictureRequested: Boolean) { | ||||||
| handler.postAndLogException { | ||||||
| with(view.getPlayerViewOrThrow()) { | ||||||
| when { | ||||||
| isPictureInPicture == isPictureInPictureRequested -> Unit // No changes | ||||||
| isPictureInPictureRequested -> enterPictureInPicture() | ||||||
| !isPictureInPictureRequested -> exitPictureInPicture() | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private fun setScalingMode(view: RNPlayerView, scalingMode: String) { | ||||||
| handler.postAndLogException { | ||||||
| view.getPlayerViewOrThrow().scalingMode = ScalingMode.valueOf(scalingMode) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private fun setCustomMessageHandlerBridgeId(view: RNPlayerView, customMessageHandlerBridgeId: NativeId) { | ||||||
| this.customMessageHandlerBridgeId = customMessageHandlerBridgeId | ||||||
| attachCustomMessageHandlerBridge(view, customMessageHandlerBridgeId) | ||||||
| } | ||||||
|
|
||||||
| private fun attachCustomMessageHandlerBridge(view: RNPlayerView, customMessageHandlerBridgeId: NativeId) { | ||||||
| view.getPlayerViewOrThrow().setCustomMessageHandler( | ||||||
| context.customMessageHandlerModule.getInstance(customMessageHandlerBridgeId).customMessageHandler, | ||||||
| ) | ||||||
| } | ||||||
|
|
||||||
|
|
@@ -237,9 +235,8 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple | |||||
| * @param playerId `Player` instance id inside `PlayerModule`'s registry. | ||||||
| */ | ||||||
| private fun attachPlayer(view: RNPlayerView, playerId: NativeId, playerConfig: ReadableMap?) { | ||||||
| handler.postAndLogException { | ||||||
| val player = context.playerModule.getPlayer(playerId) | ||||||
| val playbackConfig = playerConfig?.getMap("playbackConfig") | ||||||
| val isPictureInPictureEnabled = view.config?.pictureInPictureConfig?.isEnabled == true || | ||||||
| playbackConfig?.getBooleanOrNull("isPictureInPictureEnabled") == true | ||||||
|
|
@@ -270,7 +267,7 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple | |||||
| LayoutParams.MATCH_PARENT, | ||||||
| ) | ||||||
| view.setPlayerView(playerView) | ||||||
| customMessageHandlerBridgeId?.let { attachCustomMessageHandlerBridge(view, it) } | ||||||
| } | ||||||
|
|
||||||
| if (rnStyleConfigWrapper?.styleConfig?.isUiEnabled != false && | ||||||
|
|
@@ -285,13 +282,15 @@ class RNPlayerViewManager(private val context: ReactApplicationContext) : Simple | |||||
| } | ||||||
| } | ||||||
|
|
||||||
| /** Post and log any exceptions instead of crashing the app. */ | ||||||
| private inline fun Handler.postAndLogException(crossinline block: () -> Unit) = post { | ||||||
| try { | ||||||
| block() | ||||||
| } catch (e: Exception) { | ||||||
| Log.e(MODULE_NAME, "Error while executing command", e) | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| private fun RNPlayerView.getPlayerViewOrThrow() = playerView | ||||||
|
There was a problem hiding this comment. Nit: I quite like the require naming convention that androidx libraries use: https://developer.android.com/reference/kotlin/androidx/fragment/app/Fragment#requireActivity()
Suggested change
|
||||||
| ?: throw IllegalStateException("The player view is not yet created") | ||||||
| } | ||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.