Merge pull request #1 from AntennaPod/develop

upstream

2 files changed, 23 insertions, 4 deletions

diff --git a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
index f930c912a..e79389fb3 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/AspectRatioVideoView.java
@@ -25,6 +25,8 @@ public class AspectRatioVideoView extends VideoView {
 
     private int mVideoWidth;
     private int mVideoHeight;
+    private float mAvailableWidth = -1;
+    private float mAvailableHeight = -1;
 
     public AspectRatioVideoView(Context context) {
         this(context, null);
@@ -48,8 +50,13 @@ public class AspectRatioVideoView extends VideoView {
             return;
         }
 
-        float heightRatio = (float) mVideoHeight / (float) getHeight();
-        float widthRatio = (float) mVideoWidth / (float) getWidth();
+        if (mAvailableWidth < 0 || mAvailableHeight < 0) {
+            mAvailableWidth = getWidth();
+            mAvailableHeight = getHeight();
+        }
+
+        float heightRatio = (float) mVideoHeight / mAvailableHeight;
+        float widthRatio = (float) mVideoWidth / mAvailableWidth;
 
         int scaledHeight;
         int scaledWidth;
@@ -94,4 +101,15 @@ public class AspectRatioVideoView extends VideoView {
         invalidate();
     }
 
+    /**
+     * Sets the maximum size that the view might expand to
+     * @param width
+     * @param height
+     */
+    public void setAvailableSize(float width, float height) {
+        mAvailableWidth = width;
+        mAvailableHeight = height;
+        requestLayout();
+    }
+
 }
diff --git a/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java b/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
index 27b6ee2bc..7ce33e11f 100644
--- a/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
+++ b/app/src/main/java/de/danoeh/antennapod/view/SquareImageView.java
@@ -1,13 +1,13 @@
 package de.danoeh.antennapod.view;
 
 import android.content.Context;
+import android.support.v7.widget.AppCompatImageView;
 import android.util.AttributeSet;
-import android.widget.ImageView;
 
 /**
  * From http://stackoverflow.com/a/19449488/6839
  */
-public class SquareImageView extends ImageView {
+public class SquareImageView extends AppCompatImageView {
 
     public SquareImageView(Context context) {
         super(context);
@@ -26,6 +26,7 @@ public class SquareImageView extends ImageView {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec);
 
         int width = getMeasuredWidth();
+        //noinspection SuspiciousNameCombination
         setMeasuredDimension(width, width);
     }