diff options
| author | Andrew Dolgov <[email protected]> | 2014-10-17 23:44:21 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2014-10-17 23:44:21 +0400 |
| commit | 5685b91aa93258430565e7d00442065758755c76 (patch) | |
| tree | 135457fd69860d7aa5d57111fe0a55d529eaffc4 | |
| parent | bbf4c65fac74a7b6e2e61b20f77305b457d4e368 (diff) | |
do not upscale images in headlines more than 2x
| -rw-r--r-- | org.fox.ttrss/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | org.fox.ttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java | 13 |
2 files changed, 13 insertions, 4 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index e266e712..0f7f55e2 100644 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.fox.ttrss" - android:versionCode="240" - android:versionName="1.41" > + android:versionCode="241" + android:versionName="1.42" > <uses-sdk android:minSdkVersion="8" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java index e3f1e6f6..bf9d48d8 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java @@ -20,6 +20,7 @@ import java.lang.reflect.Field; import android.content.Context; import android.util.AttributeSet; +import android.util.Log; import android.view.View; /** @@ -163,7 +164,11 @@ public class EnlargingImageView extends android.widget.ImageView { // Try adjusting width to be proportional to height if (resizeWidth) { int newWidth = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright; - if (/*newWidth <= widthSize &&*/newWidth > 0) { + + if (newWidth > 0 && widthSize > 0 && newWidth / widthSize > 2) + newWidth = widthSize * 2; + + if (/*newWidth <= widthSize &&*/ newWidth > 0) { widthSize = Math.min(newWidth, mMaxWidthL); heightSize = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom; } @@ -172,7 +177,11 @@ public class EnlargingImageView extends android.widget.ImageView { // Try adjusting height to be proportional to width if (resizeHeight) { int newHeight = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom; - if (/*newHeight <= heightSize && */newHeight > 0) { + + if (newHeight > 0 && heightSize > 0 && newHeight / heightSize > 2) + newHeight = heightSize * 2; + + if (/* newHeight <= heightSize && */ newHeight > 0) { heightSize = Math.min(newHeight, mMaxHeightL); widthSize = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright; } |