Commit f4373f81 authored by Baris Sencan's avatar Baris Sencan
Browse files

Merge pull request #126 from jpgarcia/master 

Added isAsset same as iOS implementation
parents e4a0a93a 6350d078

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

+5 −3
Changes for android/src/main/java/com/brentvatne/react/ReactVideoView.java: 5 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    private String mSrcUriString = null;

    private String mSrcType = "mp4";

    private boolean mSrcIsNetwork = false;

    private boolean mSrcIsAsset = false;

    private ScalableType mResizeMode = ScalableType.LEFT_TOP;

    private boolean mRepeat = false;

    private boolean mPaused = false;
@@ -107,10 +108,11 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
        }

    }



    public void setSrc(final String uriString, final String type, final boolean isNetwork) {

    public void setSrc(final String uriString, final String type, final boolean isNetwork, final boolean isAsset) {

        mSrcUriString = uriString;

        mSrcType = type;

        mSrcIsNetwork = isNetwork;

        mSrcIsAsset = isAsset;



        mMediaPlayerValid = false;

        mVideoDuration = 0;
@@ -120,7 +122,7 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
        mMediaPlayer.reset();



        try {

            if (isNetwork) {

            if (isNetwork || isAsset) {

                setDataSource(uriString);

            } else {

                setRawData(mThemedReactContext.getResources().getIdentifier(
@@ -281,6 +283,6 @@ public class ReactVideoView extends ScalableVideoView implements MediaPlayer.OnP 
    @Override

    protected void onAttachedToWindow() {

        super.onAttachedToWindow();

        setSrc(mSrcUriString, mSrcType, mSrcIsNetwork);

        setSrc(mSrcUriString, mSrcType, mSrcIsNetwork, mSrcIsAsset);

    }

}

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

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

    public static final String PROP_SRC_TYPE = "type";

    public static final String PROP_SRC_IS_NETWORK = "isNetwork";

    public static final String PROP_SRC_IS_ASSET = "isAsset";

    public static final String PROP_RESIZE_MODE = "resizeMode";

    public static final String PROP_REPEAT = "repeat";

    public static final String PROP_PAUSED = "paused";
@@ -66,7 +67,8 @@ public class ReactVideoViewManager extends SimpleViewManager<ReactVideoView> { 
        videoView.setSrc(

                src.getString(PROP_SRC_URI),

                src.getString(PROP_SRC_TYPE),

                src.getBoolean(PROP_SRC_IS_NETWORK)

                src.getBoolean(PROP_SRC_IS_NETWORK),

                src.getBoolean(PROP_SRC_IS_ASSET)

        );

    }