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 8994b46d..0d4510e4 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,7 +658,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
public TextView excerptView;
public ImageView flavorImageView;
public ImageView flavorVideoPlayView;
- public TextView flavorImagePrompt;
public TextView authorView;
public TextView dateView;
public CheckBox selectionBoxView;
@@ -850,7 +849,6 @@ 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.flavorImagePrompt = (TextView) v.findViewById(R.id.flavor_image_prompt);
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);
@@ -1058,7 +1056,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.flavorImageView.setVisibility(View.VISIBLE);
holder.flavorImageView.setVisibility(View.GONE);
holder.flavorVideoPlayView.setVisibility(View.GONE);
- holder.flavorImagePrompt.setVisibility(View.GONE);
boolean videoFound = false;
@@ -1113,7 +1110,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
videoFound = true;
- holder.flavorVideoPlayView.setImageResource(R.drawable.flavor_video_play);
+ holder.flavorVideoPlayView.setImageResource(R.drawable.ic_play_circle);
ViewCompat.setTransitionName(holder.flavorImageView, "TRANSITION:ARTICLE_VIDEO_PLAYER");
@@ -1156,7 +1153,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
videoFound = true;
- holder.flavorVideoPlayView.setImageResource(R.drawable.flavor_video_play_youtube);
+ holder.flavorVideoPlayView.setImageResource(R.drawable.ic_youtube_play);
if (!thumbUri.equals(holder.flavorImageView.getTag())) {
ImageAware imageAware = new ImageViewAware(holder.flavorImageView, false);
@@ -1267,7 +1264,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.flavorImageView.setVisibility(View.VISIBLE);
if (article.flavorImageCount > 1) {
- holder.flavorImagePrompt.setVisibility(View.VISIBLE);
+ holder.flavorVideoPlayView.setVisibility(View.VISIBLE);
+ holder.flavorVideoPlayView.setImageResource(R.drawable.ic_image_album);
}
maybeRepositionFlavorImage(view, bitmap);
@@ -1294,7 +1292,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
holder.flavorImageView.setVisibility(View.VISIBLE);
if (article.flavorImageCount > 1) {
- holder.flavorImagePrompt.setVisibility(View.VISIBLE);
+ holder.flavorVideoPlayView.setVisibility(View.VISIBLE);
+ holder.flavorVideoPlayView.setImageResource(R.drawable.ic_image_album);
}
}
@@ -1395,10 +1394,9 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
lp.addRule(RelativeLayout.BELOW, R.id.headline_header);
+
} else {
lp.addRule(RelativeLayout.BELOW, 0);
- lp.topMargin = 0;
- //lp.removeRule(RelativeLayout.BELOW);
}
view.setLayoutParams(lp);
diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png
new file mode 100644
index 00000000..9bbc5bd1
Binary files /dev/null and b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png differ
diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png
new file mode 100644
index 00000000..e96c2bdf
Binary files /dev/null and b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png differ
diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png
new file mode 100644
index 00000000..f99b1536
Binary files /dev/null and b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png differ
diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png
new file mode 100644
index 00000000..a48a95cd
Binary files /dev/null and b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png differ
diff --git a/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml b/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml
deleted file mode 100644
index bbc3c1e2..00000000
--- a/org.fox.ttrss/src/main/res/drawable/flavor_video_play.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- -
-
-
-
-
-
- -
-
-
-
\ No newline at end of file
diff --git a/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml b/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml
deleted file mode 100644
index 6f57ff0f..00000000
--- a/org.fox.ttrss/src/main/res/drawable/flavor_video_play_youtube.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- -
-
-
-
-
-
- -
-
-
-
\ 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 b5764477..e54731e4 100755
--- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml
+++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml
@@ -24,22 +24,6 @@
android:layout_height="wrap_content"
android:layout_span="2">
-
-
-
-
@@ -64,6 +48,17 @@
android:background="?headlineHeaderBackground"
android:padding="16dp">
+
+
+ android:orientation="horizontal"
+ android:id="@+id/linearLayout2">
+
+
-
+ android:layout_gravity="bottom|right"
+ android:scaleType="fitXY"
+ android:src="@drawable/ic_play_circle"
+ android:visibility="visible"
+ android:layout_below="@+id/headline_header"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp" />
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 fba42d4f..58691aeb 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
@@ -25,22 +25,6 @@
android:layout_height="wrap_content"
android:layout_span="2">
-
-
-
-
@@ -65,6 +49,17 @@
android:background="?headlineHeaderBackground"
android:padding="16dp">
+
+
+ android:orientation="horizontal"
+ android:id="@+id/linearLayout2">
+
+
-
+ android:layout_gravity="bottom|right"
+ android:scaleType="fitXY"
+ android:src="@drawable/ic_play_circle"
+ android:visibility="visible"
+ android:layout_below="@+id/headline_header"
+ android:layout_alignParentRight="true"
+ android:layout_alignParentEnd="true"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp" />
diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml
index f36d9c2f..74aad95a 100755
--- a/org.fox.ttrss/src/main/res/values/style.xml
+++ b/org.fox.ttrss/src/main/res/values/style.xml
@@ -80,7 +80,7 @@
- @android:color/secondary_text_dark
- ?headlineSelectedExcerptTextColor
- #1c1c1c
- - #cc000000
+ - #99000000
- #101010
- ?colorPrimary
- @android:color/black