Skip to content

feat: enable pausing & resuming video #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andrejborstnik merged 6 commits into from
May 19, 2022
Merged

feat: enable pausing & resuming video #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5f830b9
feat: allow pausing video
andrejborstnik May 18, 2022
28cce13
feat: add option to remove pause callback & resume video
andrejborstnik May 18, 2022
6cf346c
feat: add option to pause video
andrejborstnik May 18, 2022
7e54829
feat: add option to remove pause callback & resume video
andrejborstnik May 18, 2022
8dec364
fix: android hideVideo
andrejborstnik May 18, 2022
73213aa
refactor: minor cleanup
alexandrius May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 41 additions & 2 deletions android/src/main/java/org/devio/rn/splashscreen/SplashScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,14 @@ public class SplashScreen {
private static WeakReference<Activity> mActivity;
private static boolean isVideoActive = false;
private static boolean isImageActive = false;
private static VideoView lastVideoView = null;
private static Runnable videoPauseRunnable = null;

public static void showVideo(Activity activity) {
public static void showVideo(final Activity activity) {
showVideo(activity, Arguments.createMap());
}

public static void showVideo(final Activity activity, final ReadableMap options) {
if (activity == null) return;
if (mSplashDialog != null) return;
if (isImageActive || isVideoActive) return;
Expand Down Expand Up @@ -81,11 +87,25 @@ public void run() {
videoView.setVideoPath(videoPath);
videoView.start();

lastVideoView = videoView;

int pauseAfterMs = options.hasKey("pauseAfterMs") ? options.getInt("pauseAfterMs") : 0;
if (pauseAfterMs > 0) {
videoPauseRunnable = new Runnable() {
@Override
public void run() {
if (lastVideoView != null) {
lastVideoView.pause();
}
}
};
videoView.postDelayed(videoPauseRunnable, pauseAfterMs);
}

if (!mSplashDialog.isShowing()) {
mSplashDialog.show();
}


videoView.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
@Override
public void onCompletion(MediaPlayer mp) {
Expand All @@ -97,8 +117,27 @@ public void onCompletion(MediaPlayer mp) {
});
}

public static void removeVideoPauseOption(Activity activity) {
if (isImageActive) return;
if (lastVideoView == null || videoPauseRunnable == null) return;

lastVideoView.removeCallbacks(videoPauseRunnable);
videoPauseRunnable = null;
}

public static void resumeVideo(Activity activity) {
if (isImageActive) return;
if (lastVideoView == null) return;
removeVideoPauseOption(activity);

lastVideoView.start();
}

public static void hideVideo(Activity activity) {
if (isImageActive) return;

removeVideoPauseOption(activity);
lastVideoView = null;
_hide(activity, Arguments.createMap());
}

Expand Down
17 changes: 16 additions & 1 deletion android/src/main/java/org/devio/rn/splashscreen/SplashScreenModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,14 @@ public void hide(ReadableMap options) {
SplashScreen.hide(getCurrentActivity(), options);
}

@ReactMethod
public void showVideo(ReadableMap options) {
SplashScreen.showVideo(getCurrentActivity(), options);
}

@ReactMethod
public void showVideo() {
SplashScreen.showVideo(getCurrentActivity());
showVideo(Arguments.createMap());
}

@ReactMethod
Expand All @@ -70,4 +75,14 @@ public void hideVideo() {
public void setBackgroundColor(String color) {
SplashScreen.setBackgroundColor(getCurrentActivity(), color);
}

@ReactMethod
public void removeVideoPauseOption() {
SplashScreen.removeVideoPauseOption(getCurrentActivity());
}

@ReactMethod
public void resumeVideo() {
SplashScreen.resumeVideo(getCurrentActivity());
}
}
4 changes: 3 additions & 1 deletion index.android.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ const Wrapper = {
...SplashScreen,
show: (opts = {}) => SplashScreen.show(opts),
hide: (opts = {}) => SplashScreen.hide(opts),
showVideo: () => SplashScreen.showVideo(),
showVideo: (opts = {}) => SplashScreen.showVideo(opts),
hideVideo: () => SplashScreen.hideVideo(),
resumeVideo: () => SplashScreen.resumeVideo(),
removeVideoPauseOption: () => SplashScreen.removeVideoPauseOption(),
}

export default Wrapper
4 changes: 3 additions & 1 deletion index.ios.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,10 @@ const Wrapper = {
// no opts supported
show: () => SplashScreen.show(),
hide: () => SplashScreen.hide(),
showVideo: () => SplashScreen.showVideo(),
showVideo: (opts) => SplashScreen.showVideo(opts),
hideVideo: () => SplashScreen.hideVideo(),
resumeVideo: () => SplashScreen.resumeVideo(),
removeVideoPauseOption: () => SplashScreen.removeVideoPauseOption(),
}

export default Wrapper
3 changes: 3 additions & 0 deletions ios/RNSplashScreen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@
+ (void)show;
+ (void)hide;
+ (void)showVideo;
+ (void)showVideo:(NSDictionary *)config;
+ (void)hideVideo;
+ (void)resumeVideo;
+ (void)removeVideoPauseOption;
@end
52 changes: 51 additions & 1 deletion ios/RNSplashScreen.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@

static bool showing = false;
static bool showingVideo = false;
static AVPlayer *lastPlayer = nil;
static id videoPauseObserver = nil;

@implementation RNSplashScreen
- (dispatch_queue_t)methodQueue{
Expand All @@ -25,6 +27,10 @@ - (dispatch_queue_t)methodQueue{
NSString* RNSplashScreenOverlayName = @"splashscreenVideo";

+ (void)showVideo {
[RNSplashScreen showVideo:(NSDictionary *)@{}];
}

+ (void)showVideo:(NSDictionary *)config {
if (showingVideo || showing) return;

NSString *videoPath=[[NSBundle mainBundle] pathForResource:@"splashscreen" ofType:@"mp4"];
Expand All @@ -35,10 +41,25 @@ + (void)showVideo {

NSURL *videoURL = [NSURL fileURLWithPath:videoPath];
AVPlayer *player = [AVPlayer playerWithURL:videoURL];
playerLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
lastPlayer = player;
__weak AVPlayer *_player = player;

NSNumber *pauseAfterMs = config[@"pauseAfterMs"];
if (pauseAfterMs != nil) {
videoPauseObserver = [player addBoundaryTimeObserverForTimes: @[[NSValue valueWithCMTime:CMTimeMake([pauseAfterMs intValue], 1000)]]
queue:NULL // main queue
usingBlock:^() {
if (_player == nil) {
return;
}
_player.rate = 0;
[_player pause];
}];
}

AVPlayerLayer *playerLayer = [AVPlayerLayer playerLayerWithPlayer:player];
playerLayer.frame = rootView.bounds;
playerLayer.videoGravity = AVLayerVideoGravityResizeAspectFill;
[playerLayer setName:RNSplashScreenOverlayName];

[rootView.layer addSublayer:playerLayer];
Expand All @@ -51,7 +72,9 @@ + (void)showVideo {
}

+ (void) hideVideo {
if (showing) return;
UIView *rootView = UIApplication.sharedApplication.keyWindow.subviews.lastObject;
[RNSplashScreen removeVideoPauseOption];

for (CALayer *layer in rootView.layer.sublayers) {
if ([[layer name] isEqualToString:RNSplashScreenOverlayName]) {
Expand All @@ -61,12 +84,30 @@ + (void) hideVideo {
}
}
showingVideo = false;
lastPlayer = nil;
}

+ (void) hideVideo:(AVPlayerItem*)playerItem {
[self hideVideo];
}

+ (void)resumeVideo {
if (showing) return;
if (lastPlayer == nil) return;
[RNSplashScreen removeVideoPauseOption];

lastPlayer.rate = 1;
[lastPlayer play];
}

+ (void)removeVideoPauseOption {
if (showing) return;
if (videoPauseObserver == nil || lastPlayer == nil) return;

[lastPlayer removeTimeObserver:videoPauseObserver];
videoPauseObserver = nil;
}

+ (void)show {
if (showingVideo || showing) return;

Expand All @@ -80,6 +121,7 @@ + (void)show {
}

+ (void)hide {
if (showingVideo) return;
// let's try to hide, even if showing == false, ...just in case

UIImageView *imageView = (UIImageView *)[UIApplication.sharedApplication.keyWindow.subviews.lastObject viewWithTag:RNSplashScreenOverlayTag];
Expand Down Expand Up @@ -129,4 +171,12 @@ + (NSString *)launchImageNameForOrientation:(UIDeviceOrientation)orientation {
[RNSplashScreen showVideo];
}

RCT_EXPORT_METHOD(resumeVideo) {
[RNSplashScreen resumeVideo];
}

RCT_EXPORT_METHOD(removeVideoPauseOption) {
[RNSplashScreen removeVideoPauseOption];
}

@end