diff options
author | Andrew Dolgov <[email protected]> | 2020-12-07 12:27:41 +0300 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2020-12-07 12:27:41 +0300 |
commit | 09710923973df75bfc4e5052fc81fed49bd8436a (patch) | |
tree | 00a1f15dfac4c79e1b7b5483f718337494667744 | |
parent | c04bbc457b094a321cc57bfa0c013fad9acf7045 (diff) |
support receiving kind of flavor image/stream via API
3 files changed, 20 insertions, 14 deletions
diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index e30eeafa..a74d8fed 100755 --- 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="526" - android:versionName="1.292"> + android:versionCode="527" + android:versionName="1.293"> <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> 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 22ac8e9b..f5e5d993 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -50,6 +50,16 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; +import androidx.core.app.ActivityCompat; +import androidx.core.app.ActivityOptionsCompat; +import androidx.core.view.ViewCompat; +import androidx.recyclerview.widget.DefaultItemAnimator; +import androidx.recyclerview.widget.DividerItemDecoration; +import androidx.recyclerview.widget.ItemTouchHelper; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import com.amulyakhare.textdrawable.TextDrawable; import com.amulyakhare.textdrawable.util.ColorGenerator; import com.bumptech.glide.Glide; @@ -79,15 +89,6 @@ import java.util.HashMap; import java.util.List; import java.util.TimeZone; -import androidx.core.app.ActivityCompat; -import androidx.core.app.ActivityOptionsCompat; -import androidx.core.view.ViewCompat; -import androidx.recyclerview.widget.DefaultItemAnimator; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.ItemTouchHelper; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import icepick.State; import jp.wasabeef.glide.transformations.CropCircleTransformation; @@ -1589,13 +1590,13 @@ public class HeadlinesFragment extends StateSavedFragment { private void adjustVideoKindView(ArticleViewHolder holder, Article article) { if (article.flavorImage != null) { - if ("iframe".equals(article.flavorImage.tagName().toLowerCase())) { + if (article.flavor_kind == Article.FLAVOR_KIND_YOUTUBE || "iframe".equals(article.flavorImage.tagName().toLowerCase())) { holder.flavorVideoKindView.setImageResource(R.drawable.ic_youtube_play); holder.flavorVideoKindView.setVisibility(View.VISIBLE); - } else if ("video".equals(article.flavorImage.tagName().toLowerCase())) { + } else if (article.flavor_kind == Article.FLAVOR_KIND_VIDEO || "video".equals(article.flavorImage.tagName().toLowerCase())) { holder.flavorVideoKindView.setImageResource(R.drawable.ic_play_circle); holder.flavorVideoKindView.setVisibility(View.VISIBLE); - } else if (article.mediaList.size() > 1) { + } else if (article.flavor_kind == Article.FLAVOR_KIND_ALBUM ||article.mediaList.size() > 1) { holder.flavorVideoKindView.setImageResource(R.drawable.ic_image_album); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java index bb2c09f1..a11cd0ac 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/Article.java @@ -17,6 +17,10 @@ public class Article implements Parcelable { public static final int TYPE_LOADMORE = -1; public static final int TYPE_AMR_FOOTER = -2; + public static final int FLAVOR_KIND_ALBUM = 1; + public static final int FLAVOR_KIND_VIDEO = 2; + public static final int FLAVOR_KIND_YOUTUBE = 3; + public int id; public boolean unread; public boolean marked; @@ -41,6 +45,7 @@ public class Article implements Parcelable { public boolean selected; public String flavor_image; public String flavor_stream; + public int flavor_kind; /* not serialized */ transient public Document articleDoc; |