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

consider img size attributes when choosing flavor image

Browse Source
This commit is contained in:
Andrew Dolgov 2014-11-09 20:04:03 +04:00
parent f66f8734df
commit ae20f7ba77
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
<?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="277" android:versionCode="278"
android:versionName="1.69" > android:versionName="1.69" >
<uses-sdk <uses-sdk

21
org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java
View File

@ -70,6 +70,9 @@ import java.util.TimeZone;
public class HeadlinesFragment extends Fragment implements OnItemClickListener, OnScrollListener { public class HeadlinesFragment extends Fragment implements OnItemClickListener, OnScrollListener {
public static enum ArticlesSelection { ALL, NONE, UNREAD } public static enum ArticlesSelection { ALL, NONE, UNREAD }
public static final int FLAVOR_IMG_MIN_WIDTH = 128;
public static final int FLAVOR_IMG_MIN_HEIGHT = 128;
public static final int HEADLINES_REQUEST_SIZE = 30; public static final int HEADLINES_REQUEST_SIZE = 30;
public static final int HEADLINES_BUFFER_MAX = 500; public static final int HEADLINES_BUFFER_MAX = 500;
@ -804,7 +807,21 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
//Element img = doc.select("img").first(); //Element img = doc.select("img").first();
final Elements imgs = doc.select("img"); final Elements imgs = doc.select("img");
Element img = imgs.first(); Element img = null;
for (Element tmp : imgs) {
try {
if (Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_WIDTH && Integer.valueOf(tmp.attr("width")) > FLAVOR_IMG_MIN_HEIGHT) {
img = tmp;
break;
}
} catch (NumberFormatException e) {
//
}
}
if (img == null)
img = imgs.first();
if (img != null) { if (img != null) {
String imgSrc = img.attr("src"); String imgSrc = img.attr("src");
@ -879,7 +896,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
flavorImageLoadingBar.setVisibility(View.INVISIBLE); flavorImageLoadingBar.setVisibility(View.INVISIBLE);
if (arg2.getWidth() > 128 && arg2.getHeight() > 128) { if (arg2.getWidth() > FLAVOR_IMG_MIN_WIDTH && arg2.getHeight() > FLAVOR_IMG_MIN_HEIGHT) {
if (!m_activity.isCompatMode() && weNeedAnimation) { if (!m_activity.isCompatMode() && weNeedAnimation) {
ObjectAnimator anim = ObjectAnimator.ofFloat(flavorImageView, "alpha", 0f, 1f); ObjectAnimator anim = ObjectAnimator.ofFloat(flavorImageView, "alpha", 0f, 1f);