vdocipher-rn-bridge 1.20.4 → 1.20.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -18,8 +18,8 @@ apply plugin: 'com.android.library'
18
18
  // TODO read from package.json
19
19
  // "releaseVersionName" must be the same as "version" in package.json
20
20
  // "releaseVersionCode" must increment by 1 with every release
21
- def releaseVersionName = "1.20.4"
22
- def releaseVersionCode = 36
21
+ def releaseVersionName = "1.20.5"
22
+ def releaseVersionCode = 37
23
23
 
24
24
  android {
25
25
  compileSdkVersion 33
@@ -86,5 +86,5 @@ repositories {
86
86
  dependencies {
87
87
  compileOnly 'com.facebook.react:react-native:+'
88
88
  implementation 'androidx.appcompat:appcompat:1.3.1'
89
- implementation 'com.vdocipher.aegis:vdocipher-android:1.26.4'
89
+ implementation 'com.vdocipher.aegis:vdocipher-android:1.26.5'
90
90
  }
@@ -67,7 +67,6 @@ public class ReactVdoPlayerUIView extends LinearLayout implements LifecycleEvent
67
67
  private Track[] selectedTracks;
68
68
  private Handler mainHandler;
69
69
 
70
- private static int FRAME_LAYOUT_OFFSET = 30;
71
70
  private int frameLayoutId;
72
71
 
73
72
  private int resizeMode = PlayerHost.RESIZE_MODE_FIT;
@@ -81,13 +80,30 @@ public class ReactVdoPlayerUIView extends LinearLayout implements LifecycleEvent
81
80
  setGravity(Gravity.CENTER);
82
81
  setBackgroundColor(Color.BLACK);
83
82
 
84
- FrameLayout frameLayout = new FrameLayout(context);
85
- frameLayout.setKeepScreenOn(true);
86
- frameLayoutId = getId() + FRAME_LAYOUT_OFFSET;
87
- frameLayout.setId(frameLayoutId);
83
+
84
+ FrameLayout frameLayout = LayoutInflater.from(context).inflate(R.layout.vdo_frame_layout, null).findViewById(R.id.vdo_player_frame_layout);
85
+ frameLayoutId = frameLayout.getId();
88
86
 
89
87
  addView(frameLayout);
90
88
 
89
+ frameLayout.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
90
+ @Override
91
+ public void onViewAttachedToWindow(View v) {
92
+ if (vdoPlayerUIFragment == null) {
93
+ vdoPlayerUIFragment = new VdoPlayerUIFragment();
94
+ Bundle bundle = new Bundle();
95
+ bundle.putBoolean("showControls", true);
96
+ vdoPlayerUIFragment.setArguments(bundle);
97
+ fragmentManager = activity.getSupportFragmentManager();
98
+ initializePlayer();
99
+ }
100
+ }
101
+
102
+ @Override
103
+ public void onViewDetachedFromWindow(View v) {
104
+ }
105
+ });
106
+
91
107
  context.addLifecycleEventListener(this);
92
108
 
93
109
  mainHandler = new Handler(Looper.getMainLooper());
@@ -344,14 +360,6 @@ public class ReactVdoPlayerUIView extends LinearLayout implements LifecycleEvent
344
360
  protected void onAttachedToWindow() {
345
361
  Log.d(TAG, "onAttachedToWindow");
346
362
  super.onAttachedToWindow();
347
- if (vdoPlayerUIFragment == null) {
348
- vdoPlayerUIFragment = new VdoPlayerUIFragment();
349
- Bundle bundle = new Bundle();
350
- bundle.putBoolean("showControls", true);
351
- vdoPlayerUIFragment.setArguments(bundle);
352
- fragmentManager = this.activity.getSupportFragmentManager();
353
- initializePlayer();
354
- }
355
363
  if (playWhenReady) {
356
364
  if (vdoPlayer != null) {
357
365
  vdoPlayer.setPlayWhenReady(true);
@@ -58,7 +58,6 @@ public class ReactVdoPlayerView extends LinearLayout implements LifecycleEventLi
58
58
 
59
59
  private VdoPlayer vdoPlayer;
60
60
 
61
- private static int FRAME_LAYOUT_OFFSET = 30;
62
61
  private int frameLayoutId;
63
62
 
64
63
  // from props
@@ -96,13 +95,28 @@ public class ReactVdoPlayerView extends LinearLayout implements LifecycleEventLi
96
95
  setGravity(Gravity.CENTER);
97
96
  setBackgroundColor(Color.BLACK);
98
97
 
99
- FrameLayout frameLayout = new FrameLayout(context);
100
- frameLayout.setKeepScreenOn(true);
101
- frameLayoutId = getId() + FRAME_LAYOUT_OFFSET;
102
- frameLayout.setId(frameLayoutId);
103
-
98
+ FrameLayout frameLayout = LayoutInflater.from(context).inflate(R.layout.vdo_frame_layout, null).findViewById(R.id.vdo_player_frame_layout);
99
+ frameLayoutId = frameLayout.getId();
104
100
  addView(frameLayout);
105
101
 
102
+ frameLayout.addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
103
+ @Override
104
+ public void onViewAttachedToWindow(View v) {
105
+ if (vdoPlayerUIFragment == null) {
106
+ vdoPlayerUIFragment = new VdoPlayerUIFragment();
107
+ Bundle bundle = new Bundle();
108
+ bundle.putBoolean("showControls", false);
109
+ vdoPlayerUIFragment.setArguments(bundle);
110
+ fragmentManager = activity.getSupportFragmentManager();
111
+ initializePlayer();
112
+ }
113
+ }
114
+
115
+ @Override
116
+ public void onViewDetachedFromWindow(View v) {
117
+ }
118
+ });
119
+
106
120
  eventEmitter = new VdoEventEmitter(context);
107
121
 
108
122
  setPictureInPictureSupport();
@@ -447,14 +461,6 @@ public class ReactVdoPlayerView extends LinearLayout implements LifecycleEventLi
447
461
  protected void onAttachedToWindow() {
448
462
  Log.d(TAG, "onAttachedToWindow");
449
463
  super.onAttachedToWindow();
450
- if (vdoPlayerUIFragment == null) {
451
- vdoPlayerUIFragment = new VdoPlayerUIFragment();
452
- Bundle bundle = new Bundle();
453
- bundle.putBoolean("showControls", false);
454
- vdoPlayerUIFragment.setArguments(bundle);
455
- fragmentManager = activity.getSupportFragmentManager();
456
- initializePlayer();
457
- }
458
464
  if (playWhenReady) {
459
465
  if (vdoPlayer != null) {
460
466
  vdoPlayer.setPlayWhenReady(true);
@@ -0,0 +1,6 @@
1
+ <?xml version="1.0" encoding="utf-8"?>
2
+ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
+ android:id="@+id/vdo_player_frame_layout"
4
+ android:layout_width="match_parent"
5
+ android:layout_height="wrap_content"
6
+ android:keepScreenOn="true"/>
@@ -5,7 +5,7 @@ import VdoFramework
5
5
  @objc(VdocipherRnBridge)
6
6
  class VdocipherRnBridge: RCTViewManager {
7
7
 
8
- static let vdocipherRnBridgeVersionString = "1.20.4"
8
+ static let vdocipherRnBridgeVersionString = "1.20.5"
9
9
 
10
10
  @objc override static func requiresMainQueueSetup() -> Bool {
11
11
  return true
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "vdocipher-rn-bridge",
3
- "version": "1.20.4",
3
+ "version": "1.20.5",
4
4
  "description": "React native bridge library that delegates to vdocipher native android SDK",
5
5
  "homepage": "https://www.vdocipher.com/docs/mobile/react-native/getting-started/",
6
6
  "scripts": {