Merge pull request #67 from abritopach/develop

Develop
abritopach · Nov 19, 2021 · 167b1e5 · 167b1e5
2 parents 9973add + 28416d2
commit 167b1e5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 15 deletions.
diff --git a/android/src/main/java/com/abpjap/plugin/youtubeplayer/YoutubePlayer.java b/android/src/main/java/com/abpjap/plugin/youtubeplayer/YoutubePlayer.java
@@ -46,7 +46,9 @@ public void initialize(final PluginCall call) {
 
         String videoId = call.getString("videoId");
         Boolean fullscreen = call.getBoolean("fullscreen");
-        Log.e(TAG, "[Youtube Player Plugin Native Android]: videoId " + videoId + " | fullscreen: " + fullscreen);
+        JSObject playerSize = call.getObject("playerSize");
+        Log.e(TAG, "[Youtube Player Plugin Native Android]: videoId " + videoId + " | fullscreen: " + fullscreen +
+        " | playerSize: " + playerSize.toString());
 
         Intent intent= new Intent();
         intent.setClass(context, YoutubePlayerFragment.class);

diff --git a/android/src/main/java/com/abpjap/plugin/youtubeplayer/YoutubePlayerFragment.java b/android/src/main/java/com/abpjap/plugin/youtubeplayer/YoutubePlayerFragment.java
@@ -51,8 +51,9 @@ private void initializeYoutubePlayer(final String videoId) {
         if (obj instanceof YouTubePlayerSupportFragment)
             youTubePlayerFragment = (YouTubePlayerSupportFragment) obj;
 
-        if (youTubePlayerFragment == null)
+        if (youTubePlayerFragment == null) {
             return;
+        }
 
         youTubePlayerFragment.initialize(BuildConfig.YOUTUBE_API_KEY, new YouTubePlayer.OnInitializedListener() {
 
@@ -61,6 +62,7 @@ public void onInitializationSuccess(YouTubePlayer.Provider provider, YouTubePlay
                                                 boolean wasRestored) {
 
                 if (!wasRestored) {
+
                     youTubePlayer = player;
 
                     // Set the player style default.
@@ -72,6 +74,7 @@ public void onInitializationSuccess(YouTubePlayer.Provider provider, YouTubePlay
                     RxBus.publish(result);
 
                     // Specify that we want to handle fullscreen behavior ourselves.
+
                     youTubePlayer.addFullscreenControlFlag(YouTubePlayer.FULLSCREEN_FLAG_CUSTOM_LAYOUT);
                     youTubePlayer.setOnFullscreenListener(new YouTubePlayer.OnFullscreenListener() {
                         @Override
@@ -84,17 +87,18 @@ public void onFullscreen(boolean b) {
                     if (fullscreen) {
                         youTubePlayer.setFullscreen(fullscreen);
                     }
+
                     // Cue the video by videoId.
                     youTubePlayer.cueVideo(videoId);
 
                 }
             }
 
             @Override
-            public void onInitializationFailure(YouTubePlayer.Provider arg0, YouTubeInitializationResult arg1) {
+            public void onInitializationFailure(YouTubePlayer.Provider provider, YouTubeInitializationResult error) {
 
                 // Print or show error if initialization failed.
-                Log.e(TAG, "Youtube Player View initialization failed");
+                Log.e(TAG, "Youtube Player View initialization failed -> error:" + error.toString());
 
                 RxBus.publish("Youtube Player View initialization failed");
             }

diff --git a/ios/Plugin.xcworkspace/xcuserdata/abrito.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Plugin.xcworkspace/xcuserdata/abrito.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/ios/Plugin/Plugin.swift b/ios/Plugin/Plugin.swift
@@ -26,8 +26,7 @@ public class YoutubePlayer: CAPPlugin {
 
             let options = [
                 "videoId" : call.getString("videoId") ?? nil,
-                "width" : call.getInt("width") ?? nil,
-                "height": call.getInt("height") ?? nil,
+                "playerSize" : call.getObject("playerSize") ?? nil,
                 "playerVars": call.getObject("playerVars") ?? nil
                 ] as [String : Any]
 

diff --git a/ios/Plugin/YPViewController.swift b/ios/Plugin/YPViewController.swift
@@ -36,10 +36,9 @@ public class YPViewController: UIViewController, YouTubePlayerDelegate {
                 SVProgressHUD.show()
                 // treat it as a string key dictionary.
                 let videoId = dictionary["videoId"] as! String
-                let width = dictionary["width"] as! Int
-                let height = dictionary["height"] as! Int
                 // let playerVars = dictionary["playerVars"] as! [String: Any]
-                let playerSize: [String : Int] = checkSize(width: width, height: height)
+                var playerSize = dictionary["playerSize"] as! [String: Int]
+                playerSize = checkSize(size: playerSize)
                 youtubePlayer = YouTubePlayerView(frame: CGRect(x: 0, y: 0, width: playerSize["width"]!, height: playerSize["height"]!))
 
                 youtubePlayer.delegate = self
@@ -54,15 +53,15 @@ public class YPViewController: UIViewController, YouTubePlayerDelegate {
         super.didReceiveMemoryWarning()
         // Dispose of any resources that can be recreated.
     }
-    func checkSize(width: Int, height: Int) -> [String : Int] {
+    func checkSize(size: [String: Int]) -> [String : Int] {
         var playerSize = [
-            "width" : width ?? self._defaultSizes["width"]!,
-            "height": height ?? self._defaultSizes["height"]!
+            "width" : size["width"] ?? self._defaultSizes["width"]!,
+            "height": size["height"] ?? self._defaultSizes["height"]!
         ] as [String : Int]
-        if (playerSize["height"] as! Int > Int(UIScreen.main.bounds.height)) {
+        if (playerSize["height"]! > Int(UIScreen.main.bounds.height)) {
             playerSize["height"] = Int(UIScreen.main.bounds.height);
         }
-        if (playerSize["width"] as! Int > Int(UIScreen.main.bounds.width)) {
+        if (playerSize["width"]! > Int(UIScreen.main.bounds.width)) {
             playerSize["width"] = Int(UIScreen.main.bounds.width);
         }
         return playerSize;

diff --git a/src/definitions.ts b/src/definitions.ts
@@ -1,7 +1,7 @@
 import type { IPlayerVars, IPlayerState, IPlayerSize } from './web/models/models';
 
 export interface YoutubePlayerPlugin {
-  initialize(options: {playerId: string, playerSize: IPlayerSize, videoId: string, playerVars?: IPlayerVars,
+  initialize(options: {playerId?: string, playerSize: IPlayerSize, videoId: string, playerVars?: IPlayerVars,
     debug?: boolean}): Promise<{playerReady: boolean, player: string} | undefined>;
   destroy(playerId: string): Promise<{result: { method: string, value: boolean }}>;
   // Methods playback controls and player settings..