summaryrefslogtreecommitdiff
path: root/org.fox.ttrss
diff options
context:
space:
mode:
authorAndrew Dolgov <[email protected]>2015-07-10 01:16:11 +0300
committerAndrew Dolgov <[email protected]>2015-07-10 01:16:11 +0300
commita0296da672e5987ab7dcc932c9fffe99b6e196dc (patch)
treeaba7604f50a92abdeafe375662fb37b39bd56365 /org.fox.ttrss
parent5df93fe9d60ceb24e50d4546660dbb0b3757d4d0 (diff)
add play icon for videos
Diffstat (limited to 'org.fox.ttrss')
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java6
-rw-r--r--org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.pngbin0 -> 807 bytes
-rw-r--r--org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.pngbin0 -> 1114 bytes
-rw-r--r--org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.pngbin0 -> 1476 bytes
-rw-r--r--org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.pngbin0 -> 2153 bytes
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row.xml8
-rwxr-xr-xorg.fox.ttrss/src/main/res/layout/headlines_row_unread.xml8
7 files changed, 22 insertions, 0 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 4c98a165..dbd74928 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
@@ -658,6 +658,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
public TextView excerptView;
public ImageView flavorImageView;
public VideoView flavorVideoView;
+ public ImageView flavorVideoPlayView;
public TextView authorView;
public TextView dateView;
public CheckBox selectionBoxView;
@@ -825,6 +826,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
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.flavorVideoPlayView = (ImageView) v.findViewById(R.id.flavor_video_play);
holder.authorView = (TextView)v.findViewById(R.id.author);
holder.dateView = (TextView) v.findViewById(R.id.date);
holder.selectionBoxView = (CheckBox) v.findViewById(R.id.selected);
@@ -1030,6 +1032,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.flavorImageView.setVisibility(View.VISIBLE);
holder.flavorImageLoadingBar.setVisibility(View.VISIBLE);
holder.flavorVideoView.setVisibility(View.GONE);
+ holder.flavorVideoPlayView.setVisibility(View.GONE);
boolean videoFound = false;
@@ -1046,6 +1049,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.flavorImageLoadingBar.setVisibility(View.GONE);
holder.flavorVideoView.setVisibility(View.VISIBLE);
holder.flavorImageView.setVisibility(View.GONE);
+ holder.flavorVideoPlayView.setVisibility(View.VISIBLE);
if (!streamUri.equals(holder.flavorVideoView.getTag())) {
holder.flavorVideoView.setTag(streamUri);
@@ -1075,8 +1079,10 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
if (event.getAction() == MotionEvent.ACTION_DOWN) {
if (video.isPlaying()) {
video.pause();
+ holder.flavorVideoPlayView.setVisibility(View.VISIBLE);
} else {
video.start();
+ holder.flavorVideoPlayView.setVisibility(View.GONE);
}
}
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png
new file mode 100644
index 00000000..0005446b
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png
Binary files differ
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png
new file mode 100644
index 00000000..198f6cbb
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png
Binary files differ
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png
new file mode 100644
index 00000000..76479288
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png
Binary files differ
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png
new file mode 100644
index 00000000..57058bf6
--- /dev/null
+++ b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png
Binary files differ
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 047160af..b662d61e 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -98,6 +98,14 @@
android:layout_gravity="center"
android:visibility="gone" />
+ <ImageView
+ android:id="@+id/flavor_video_play"
+ android:layout_width="64dp"
+ android:layout_height="64dp"
+ android:layout_gravity="center"
+ android:src="@drawable/ic_youtube_play"
+ 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 203e8b13..5e9307e6 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
@@ -100,6 +100,14 @@
android:layout_gravity="center"
android:visibility="gone" />
+ <ImageView
+ android:id="@+id/flavor_video_play"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_gravity="center"
+ android:src="@drawable/ic_youtube_play"
+ android:visibility="gone" />
+
<org.fox.ttrss.util.ArrowRight
android:layout_marginRight="16dp"
android:id="@+id/flavorImageArrow"