iamthefij/tt-rss-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

do not upscale images in headlines more than 2x

Browse Source
This commit is contained in:
Andrew Dolgov 2014-10-17 23:44:21 +04:00
parent bbf4c65fac
commit 5685b91aa9
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
org.fox.ttrss/src/main/AndroidManifest.xml
View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.fox.ttrss" package="org.fox.ttrss"
android:versionCode="240" android:versionCode="241"
android:versionName="1.41" > android:versionName="1.42" >
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="8"

9
org.fox.ttrss/src/main/java/org/fox/ttrss/util/EnlargingImageView.java
View File

@ -20,6 +20,7 @@ import java.lang.reflect.Field;
import android.content.Context; import android.content.Context;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Log;
import android.view.View; import android.view.View;
/** /**
@ -163,6 +164,10 @@ public class EnlargingImageView extends android.widget.ImageView {
// Try adjusting width to be proportional to height // Try adjusting width to be proportional to height
if (resizeWidth) { if (resizeWidth) {
int newWidth = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright; int newWidth = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright;
if (newWidth > 0 && widthSize > 0 && newWidth / widthSize > 2)
newWidth = widthSize * 2;
if (/*newWidth <= widthSize &&*/ newWidth > 0) { if (/*newWidth <= widthSize &&*/ newWidth > 0) {
widthSize = Math.min(newWidth, mMaxWidthL); widthSize = Math.min(newWidth, mMaxWidthL);
heightSize = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom; heightSize = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom;
@ -172,6 +177,10 @@ public class EnlargingImageView extends android.widget.ImageView {
// Try adjusting height to be proportional to width // Try adjusting height to be proportional to width
if (resizeHeight) { if (resizeHeight) {
int newHeight = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom; int newHeight = (int) ((widthSize - pleft - pright) / desiredAspect) + ptop + pbottom;
if (newHeight > 0 && heightSize > 0 && newHeight / heightSize > 2)
newHeight = heightSize * 2;
if (/* newHeight <= heightSize && */ newHeight > 0) { if (/* newHeight <= heightSize && */ newHeight > 0) {
heightSize = Math.min(newHeight, mMaxHeightL); heightSize = Math.min(newHeight, mMaxHeightL);
widthSize = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright; widthSize = (int) (desiredAspect * (heightSize - ptop - pbottom)) + pleft + pright;