diff options
Diffstat (limited to 'org.fox.ttrss')
4 files changed, 136 insertions, 44 deletions
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 8f6f583f..4c98a165 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 @@ -8,6 +8,7 @@ import android.content.res.Resources.Theme; import android.graphics.Bitmap; import android.graphics.Paint; import android.graphics.drawable.Drawable; +import android.media.MediaPlayer; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -28,6 +29,7 @@ import android.view.ContextMenu.ContextMenuInfo; import android.view.Display; import android.view.LayoutInflater; import android.view.MenuItem; +import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.ViewGroup; @@ -43,6 +45,7 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.ProgressBar; import android.widget.TextView; +import android.widget.VideoView; import com.amulyakhare.textdrawable.TextDrawable; import com.amulyakhare.textdrawable.util.ColorGenerator; @@ -654,6 +657,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public ImageView publishedView; public TextView excerptView; public ImageView flavorImageView; + public VideoView flavorVideoView; public TextView authorView; public TextView dateView; public CheckBox selectionBoxView; @@ -664,7 +668,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, public View headlineFooter; public ImageView textImage; public ImageView textChecked; - } + } private class ArticleListAdapter extends ArrayAdapter<Article> { private ArrayList<Article> items; @@ -820,6 +824,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, holder.publishedView = (ImageView)v.findViewById(R.id.published); holder.excerptView = (TextView)v.findViewById(R.id.excerpt); holder.flavorImageView = (ImageView) v.findViewById(R.id.flavor_image); + holder.flavorVideoView = (VideoView) v.findViewById(R.id.flavor_video); holder.authorView = (TextView)v.findViewById(R.id.author); holder.dateView = (TextView) v.findViewById(R.id.date); holder.selectionBoxView = (CheckBox) v.findViewById(R.id.selected); @@ -1018,47 +1023,114 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } } - if (!m_compactLayoutMode) { + if (!m_compactLayoutMode && holder.flavorImageHolder != null) { + + /* reset to default in case of convertview */ + holder.flavorImageHolder.setVisibility(View.VISIBLE); + holder.flavorImageView.setVisibility(View.VISIBLE); + holder.flavorImageLoadingBar.setVisibility(View.VISIBLE); + holder.flavorVideoView.setVisibility(View.GONE); + + boolean videoFound = false; - if (showFlavorImage && holder.flavorImageView != null) { - holder.flavorImageArrow.setVisibility(View.GONE); + if (m_prefs.getBoolean("enable_headlines_video", false) && article.articleDoc != null && holder.flavorVideoView != null) { + Element source = article.articleDoc.select("video > source").first(); - if (article.noValidFlavorImage) { - holder.flavorImageHolder.setVisibility(View.GONE); - } else if (article.articleDoc != null) { + if (source != null) { + try { + Uri streamUri = Uri.parse(source.attr("src")); - if (article.flavorImage != null) { - String imgSrc = article.flavorImage.attr("src"); - final String imgSrcFirst = imgSrc; + if (streamUri != null) { + videoFound = true; - // retarded schema-less urls - if (imgSrc.indexOf("//") == 0) - imgSrc = "http:" + imgSrc; + holder.flavorImageLoadingBar.setVisibility(View.GONE); + holder.flavorVideoView.setVisibility(View.VISIBLE); + holder.flavorImageView.setVisibility(View.GONE); + + if (!streamUri.equals(holder.flavorVideoView.getTag())) { + holder.flavorVideoView.setTag(streamUri); + + holder.flavorVideoView.setVideoURI(streamUri); + + holder.flavorVideoView.setOnPreparedListener(new MediaPlayer.OnPreparedListener() { + @Override + public void onPrepared(MediaPlayer mp) { + //mp.setLooping(true); + mp.seekTo(1000); + } + }); + + holder.flavorVideoView.setOnCompletionListener(new MediaPlayer.OnCompletionListener() { + @Override + public void onCompletion(MediaPlayer mp) { + mp.seekTo(0); + } + }); + + holder.flavorVideoView.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + VideoView video = (VideoView) v; + + if (event.getAction() == MotionEvent.ACTION_DOWN) { + if (video.isPlaying()) { + video.pause(); + } else { + video.start(); + } + } + + return true; + } + }); + } + } + } catch (Exception e) { + e.printStackTrace(); + videoFound = false; + } + } + } - ViewCompat.setTransitionName(holder.flavorImageView, "TRANSITION:ARTICLE_IMAGES_PAGER"); + if (!videoFound && showFlavorImage && holder.flavorImageView != null) { + holder.flavorImageArrow.setVisibility(View.GONE); - holder.flavorImageView.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View view) { + if (article.noValidFlavorImage) { + holder.flavorImageHolder.setVisibility(View.GONE); + } else if (article.articleDoc != null) { - Intent intent = new Intent(m_activity, ArticleImagesPagerActivity.class); - intent.putExtra("firstSrc", imgSrcFirst); - intent.putExtra("title", article.title); - intent.putExtra("content", article.content); + if (article.flavorImage != null) { + String imgSrc = article.flavorImage.attr("src"); + final String imgSrcFirst = imgSrc; - ActivityOptionsCompat options = - ActivityOptionsCompat.makeSceneTransitionAnimation(m_activity, - holder.flavorImageView, // The view which starts the transition - "TRANSITION:ARTICLE_IMAGES_PAGER" // The transitionName of the view we’re transitioning to - ); - ActivityCompat.startActivity(m_activity, intent, options.toBundle()); + // retarded schema-less urls + if (imgSrc.indexOf("//") == 0) + imgSrc = "http:" + imgSrc; - //startActivityForResult(intent, 0); - } - }); + ViewCompat.setTransitionName(holder.flavorImageView, "TRANSITION:ARTICLE_IMAGES_PAGER"); - //final ViewGroup flavorImageHolder = holder.flavorImageHolder; - //final ProgressBar flavorImageLoadingBar = holder.flavorImageLoadingBar; + holder.flavorImageView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View view) { + + Intent intent = new Intent(m_activity, ArticleImagesPagerActivity.class); + intent.putExtra("firstSrc", imgSrcFirst); + intent.putExtra("title", article.title); + intent.putExtra("content", article.content); + + ActivityOptionsCompat options = + ActivityOptionsCompat.makeSceneTransitionAnimation(m_activity, + holder.flavorImageView, // The view which starts the transition + "TRANSITION:ARTICLE_IMAGES_PAGER" // The transitionName of the view we’re transitioning to + ); + ActivityCompat.startActivity(m_activity, intent, options.toBundle()); + + //startActivityForResult(intent, 0); + } + }); + + //final ViewGroup flavorImageHolder = holder.flavorImageHolder; + //final ProgressBar flavorImageLoadingBar = holder.flavorImageLoadingBar; if (holder.flavorImageView.getTag() == null || !holder.flavorImageView.getTag().equals(imgSrc)) { @@ -1109,20 +1181,20 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, } - } else{ - article.noValidFlavorImage = true; - holder.flavorImageHolder.setVisibility(View.GONE); - } + } else { + article.noValidFlavorImage = true; + holder.flavorImageHolder.setVisibility(View.GONE); + } - } else { - article.noValidFlavorImage = true; - holder.flavorImageHolder.setVisibility(View.GONE); - } + } else { + article.noValidFlavorImage = true; + holder.flavorImageHolder.setVisibility(View.GONE); + } - } else if (holder.flavorImageHolder != null) { - holder.flavorImageHolder.setVisibility(View.GONE); - } - } + } else if (!videoFound && holder.flavorImageHolder != null) { + holder.flavorImageHolder.setVisibility(View.GONE); + } + } String articleAuthor = article.author != null ? article.author : ""; 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 409fdd8a..047160af 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -91,6 +91,13 @@ android:cropToPadding="true" android:visibility="visible" /> + <VideoView + android:id="@+id/flavor_video" + android:layout_width="match_parent" + android:layout_height="200dp" + android:layout_gravity="center" + android:visibility="gone" /> + <org.fox.ttrss.util.ArrowRight android:layout_marginRight="16dp" android:id="@+id/flavorImageArrow" 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 79e212c0..203e8b13 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -93,6 +93,13 @@ android:cropToPadding="true" android:visibility="visible" /> + <VideoView + android:id="@+id/flavor_video" + android:layout_width="match_parent" + android:layout_height="200dp" + android:layout_gravity="center" + android:visibility="gone" /> + <org.fox.ttrss.util.ArrowRight android:layout_marginRight="16dp" android:id="@+id/flavorImageArrow" diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index e8fcdcb6..1fa6a265 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -188,6 +188,12 @@ android:defaultValue="false" android:key="transport_debugging" android:title="@string/transport_debugging" /> + <org.fox.ttrss.util.LessBrokenSwitchPreference + android:defaultValue="false" + android:key="enable_headlines_video" + android:title="Video in headlines" + android:summary="Enable rudimentary video player in headlines view" /> + </PreferenceCategory> <Preference |