diff options
7 files changed, 17 insertions, 31 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index 939326af..22f21d87 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="245" - android:versionName="1.46" > + android:versionCode="246" + android:versionName="1.47" > <uses-sdk android:minSdkVersion="9" diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index ce030ea8..34547d8b 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -40,6 +40,8 @@ import com.google.gson.JsonElement; import com.nostra13.universalimageloader.core.DisplayImageOptions; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.assist.FailReason; +import com.nostra13.universalimageloader.core.imageaware.ImageAware; +import com.nostra13.universalimageloader.core.imageaware.ImageViewAware; import com.nostra13.universalimageloader.core.listener.ImageLoadingListener; import org.fox.ttrss.types.Article; @@ -870,15 +872,18 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (imgSrc.indexOf("//") == 0) imgSrc = "http:" + imgSrc; - DisplayImageOptions options = new DisplayImageOptions.Builder(). - cacheInMemory(true). - cacheOnDisk(true). - build(); + DisplayImageOptions options = new DisplayImageOptions.Builder() + .cacheInMemory(true) + .resetViewBeforeLoading(true) + .cacheOnDisk(true) + .build(); final ImageView flavorImageView = holder.flavorImageView; final ViewGroup flavorImageHolder = holder.flavorImageHolder; - - ImageLoader.getInstance().displayImage(imgSrc, holder.flavorImageView, options, new ImageLoadingListener() { + + ImageAware imageAware = new ImageViewAware(holder.flavorImageView, false); + + ImageLoader.getInstance().displayImage(imgSrc, imageAware, options, new ImageLoadingListener() { @Override public void onLoadingCancelled(String arg0, diff --git a/org.fox.ttrss/src/main/res/drawable/flavor_image_border.xml b/org.fox.ttrss/src/main/res/drawable/flavor_image_border.xml deleted file mode 100644 index f59d75d8..00000000 --- a/org.fox.ttrss/src/main/res/drawable/flavor_image_border.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - - <corners android:radius="0dp" /> - - <stroke - android:width="1dp" - android:color="#cccccc" /> - -</shape>
\ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index d09800ee..e660bf5f 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -75,7 +75,7 @@ android:id="@+id/flavorImageHolder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="10dp" + android:paddingBottom="4dp" android:layout_span="2"> <org.fox.ttrss.util.EnlargingImageView @@ -84,10 +84,8 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:adjustViewBounds="true" - android:background="@drawable/flavor_image_border" android:scaleType="fitCenter" android:cropToPadding="true" - android:padding="2dp" android:visibility="visible" /> </FrameLayout> </TableRow> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml index 1228147a..d95d7ebb 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected.xml @@ -75,7 +75,7 @@ android:id="@+id/flavorImageHolder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="10dp" + android:paddingBottom="4dp" android:layout_span="2"> <org.fox.ttrss.util.EnlargingImageView @@ -84,10 +84,8 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:adjustViewBounds="true" - android:background="@drawable/flavor_image_border" android:scaleType="fitCenter" android:cropToPadding="true" - android:padding="2dp" android:visibility="visible" /> </FrameLayout> </TableRow> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml index 9e808aa1..1dc3eda1 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread.xml @@ -76,7 +76,7 @@ android:id="@+id/flavorImageHolder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="10dp" + android:paddingBottom="4dp" android:layout_span="2"> <org.fox.ttrss.util.EnlargingImageView @@ -85,10 +85,8 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:adjustViewBounds="true" - android:background="@drawable/flavor_image_border" android:scaleType="fitCenter" android:cropToPadding="true" - android:padding="2dp" android:visibility="visible" /> </FrameLayout> </TableRow> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index de5ea006..0ebe6699 100644 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -76,7 +76,7 @@ android:id="@+id/flavorImageHolder" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="10dp" + android:paddingBottom="4dp" android:layout_span="2"> <org.fox.ttrss.util.EnlargingImageView @@ -85,10 +85,8 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:adjustViewBounds="true" - android:background="@drawable/flavor_image_border" android:scaleType="fitCenter" android:cropToPadding="true" - android:padding="2dp" android:visibility="visible" /> </FrameLayout> </TableRow> |