Merge pull request #78 from tachang/release/0.3.0b

Make preview work and add onClickVideoFrame callback
ksnnacar · Dec 27, 2016 · 1feac5e · 1feac5e
2 parents 8931c2c + 90850c7
commit 1feac5e
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 8 deletions.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/build.gradle b/build.gradle
@@ -3,7 +3,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }
 

diff --git a/library/src/main/java/com/afollestad/easyvideoplayer/EasyVideoCallback.java b/library/src/main/java/com/afollestad/easyvideoplayer/EasyVideoCallback.java
@@ -24,4 +24,6 @@ public interface EasyVideoCallback {
     void onRetry(EasyVideoPlayer player, Uri source);
 
     void onSubmit(EasyVideoPlayer player, Uri source);
+
+    void onClickVideoFrame(EasyVideoPlayer player);
 }
diff --git a/library/src/main/java/com/afollestad/easyvideoplayer/EasyVideoPlayer.java b/library/src/main/java/com/afollestad/easyvideoplayer/EasyVideoPlayer.java
@@ -776,10 +776,15 @@ public boolean onError(MediaPlayer mediaPlayer, int what, int extra) {
     protected void onFinishInflate() {
         super.onFinishInflate();
 
+        if(isInEditMode()) {
+            return;
+        }
+
         setKeepScreenOn(true);
 
         mHandler = new Handler();
         mPlayer = new MediaPlayer();
+
         mPlayer.setOnPreparedListener(this);
         mPlayer.setOnBufferingUpdateListener(this);
         mPlayer.setOnCompletionListener(this);
@@ -814,6 +819,9 @@ protected void onFinishInflate() {
                 ViewGroup.LayoutParams.WRAP_CONTENT);
         controlsLp.gravity = Gravity.BOTTOM;
         addView(mControlsFrame, controlsLp);
+
+        final EasyVideoPlayer easyVideoPlayer = this;
+
         if (mControlsDisabled) {
             mClickFrame.setOnClickListener(null);
             mControlsFrame.setVisibility(View.GONE);
@@ -822,6 +830,7 @@ protected void onFinishInflate() {
                 @Override
                 public void onClick(View view) {
                     toggleControls();
+                    mCallback.onClickVideoFrame(easyVideoPlayer);
                 }
             });
         }

diff --git a/sample/src/main/java/com/afollestad/easyvideoplayersample/MainActivity.java b/sample/src/main/java/com/afollestad/easyvideoplayersample/MainActivity.java
@@ -78,4 +78,10 @@ public void onRetry(EasyVideoPlayer player, Uri source) {
     public void onSubmit(EasyVideoPlayer player, Uri source) {
         Toast.makeText(this, "Submit", Toast.LENGTH_SHORT).show();
     }
+
+    @Override
+    public void onClickVideoFrame(EasyVideoPlayer player) {
+        Toast.makeText(this, "Click video frame.", Toast.LENGTH_SHORT).show();
+
+    }
 }