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

when using flavor image overflow menu prefer stream URI is available for sharing etc

Browse Source
This commit is contained in:
Andrew Dolgov 2017-06-01 12:31:14 +03:00
parent 4582e6afef
commit b7b4d29395
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1147,15 +1147,18 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
@Override @Override
public boolean onMenuItemClick(MenuItem item) { public boolean onMenuItemClick(MenuItem item) {
Uri mediaUri = Uri.parse(article.flavorStreamUri != null ? article.flavorStreamUri : article.flavorImageUri);
switch (item.getItemId()) { switch (item.getItemId()) {
case R.id.article_img_open: case R.id.article_img_open:
m_activity.openUri(Uri.parse(article.flavorImageUri)); m_activity.openUri(mediaUri);
return true; return true;
case R.id.article_img_copy: case R.id.article_img_copy:
m_activity.copyToClipboard(article.flavorImageUri); m_activity.copyToClipboard(mediaUri.toString());
return true; return true;
case R.id.article_img_share: case R.id.article_img_share:
m_activity.shareText(article.flavorImageUri); m_activity.shareText(mediaUri.toString());
return true; return true;
case R.id.article_img_view_caption: case R.id.article_img_view_caption:
m_activity.displayImageCaption(article.flavorImageUri, article.content); m_activity.displayImageCaption(article.flavorImageUri, article.content);

4
org.fox.ttrss/src/main/res/menu/context_article_content_img.xml
View File

@ -12,8 +12,8 @@
<item <item
android:id="@+id/article_img_share" android:id="@+id/article_img_share"
android:icon="@drawable/ic_share" android:icon="@drawable/ic_share"
app:showAsAction="ifRoom" app:showAsAction=""
android:title="@string/article_img_share"/> android:title="@string/article_media_share"/>
<item <item
android:id="@+id/article_img_view_caption" android:id="@+id/article_img_view_caption"
app:showAsAction="" app:showAsAction=""

3
org.fox.ttrss/src/main/res/values/strings.xml
View File

@ -164,8 +164,7 @@
<string name="headlines_starred">Starred</string> <string name="headlines_starred">Starred</string>
<string name="headlines_published">Published</string> <string name="headlines_published">Published</string>
<string name="headlines_unread">Unread</string> <string name="headlines_unread">Unread</string>
<string name="article_img_open">Open image</string> <string name="article_media_share">Share</string>
<string name="article_img_share">Share image</string>
<string name="article_img_view_caption">View Caption</string> <string name="article_img_view_caption">View Caption</string>
<string name="pref_headlines_mark_read_scroll">Mark read on scroll</string> <string name="pref_headlines_mark_read_scroll">Mark read on scroll</string>
<string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string> <string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string>