Commit c547b5a3 authored by Matt Apperson's avatar Matt Apperson Committed by GitHub
Browse files

Merge pull request #270 from 5minutes/add-controls-option-android 

Add controls property to Android
parents 81b852ae 7c2ebfba

android/src/main/java/com/brentvatne/react/ReactVideoView.java

+66 −1
Changes for android/src/main/java/com/brentvatne/react/ReactVideoView.java: 66 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -4,8 +4,10 @@ import android.media.MediaPlayer; 
import android.net.Uri;

import android.os.Handler;

import android.util.Log;

import android.view.MotionEvent;

import android.webkit.CookieManager;



import android.widget.MediaController;

import com.facebook.react.bridge.Arguments;

import com.facebook.react.bridge.LifecycleEventListener;

import com.facebook.react.bridge.WritableMap;
@@ -18,7 +20,7 @@ import java.util.HashMap; 
import java.util.Map;



public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnPreparedListener, MediaPlayer

        .OnErrorListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnInfoListener, LifecycleEventListener {

        .OnErrorListener, MediaPlayer.OnBufferingUpdateListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnInfoListener, LifecycleEventListener, MediaController.MediaPlayerControl {



    public enum Events {

        EVENT_LOAD_START("onVideoLoadStart"),
@@ -68,6 +70,9 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 


    private Handler mProgressUpdateHandler = new Handler();

    private Runnable mProgressUpdateRunnable = null;

    private Handler videoControlHandler = new Handler();

    private MediaController mediaController;





    private String mSrcUriString = null;

    private String mSrcType = "mp4";
@@ -85,6 +90,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    private int mVideoDuration = 0;

    private int mVideoBufferedDuration = 0;

    private boolean isCompleted = false;

    private boolean mUseNativeControls = false;



    public ReactVideoView(ThemedReactContext themedReactContext) {

        super(themedReactContext);
@@ -112,6 +118,16 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
        mProgressUpdateHandler.post(mProgressUpdateRunnable);

    }



    @Override

    public boolean onTouchEvent(MotionEvent event) {

        if (mUseNativeControls) {

            initializeMediaControllerIfNeeded();

            mediaController.show();

        }



        return super.onTouchEvent(event);

    }



    private void initializeMediaPlayerIfNeeded() {

        if (mMediaPlayer == null) {

            mMediaPlayerValid = false;
@@ -123,7 +139,12 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
            mMediaPlayer.setOnBufferingUpdateListener(this);

            mMediaPlayer.setOnCompletionListener(this);

            mMediaPlayer.setOnInfoListener(this);

        }

    }



    private void initializeMediaControllerIfNeeded() {

        if (mediaController == null) {

            mediaController = new MediaController(this.getContext());

        }

    }
@@ -267,6 +288,11 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
        mPlayInBackground = playInBackground;

    }



    public void setControls(boolean controls) {

        this.mUseNativeControls = controls;

    }





    @Override

    public void onPrepared(MediaPlayer mp) {
@@ -296,6 +322,20 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
        mEventEmitter.receiveEvent(getId(), Events.EVENT_LOAD.toString(), event);



        applyModifiers();



        if (mUseNativeControls) {

            initializeMediaControllerIfNeeded();

            mediaController.setMediaPlayer(this);

            mediaController.setAnchorView(this);



            videoControlHandler.post(new Runnable() {

                @Override

                public void run() {

                    mediaController.setEnabled(true);

                    mediaController.show();

                }

            });

        }

    }



    @Override
@@ -349,6 +389,31 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
        }

    }



    @Override

    public int getBufferPercentage() {

        return 0;

    }



    @Override

    public boolean canPause() {

        return true;

    }



    @Override

    public boolean canSeekBackward() {

        return true;

    }



    @Override

    public boolean canSeekForward() {

        return true;

    }



    @Override

    public int getAudioSessionId() {

        return 0;

    }



    @Override

    public void onCompletion(MediaPlayer mp) {

android/src/main/java/com/brentvatne/react/ReactVideoViewManager.java

+6 −0
Changes for android/src/main/java/com/brentvatne/react/ReactVideoViewManager.java: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ public class ReactVideoViewManager extends SimpleViewManager<ReactVideoView> { 
    public static final String PROP_SEEK = "seek";

    public static final String PROP_RATE = "rate";

    public static final String PROP_PLAY_IN_BACKGROUND = "playInBackground";

    public static final String PROP_CONTROLS = "controls";



    @Override

    public String getName() {
@@ -112,4 +113,9 @@ public class ReactVideoViewManager extends SimpleViewManager<ReactVideoView> { 
    public void setPlayInBackground(final ReactVideoView videoView, final boolean playInBackground) {

        videoView.setPlayInBackground(playInBackground);

    }



    @ReactProp(name = PROP_CONTROLS, defaultBoolean = false)

    public void setControls(final ReactVideoView videoView, final boolean controls) {

        videoView.setControls(controls);

    }

}