Change mark previous/next as read order on Android (#623)

This commit is contained in:
Mark Anderson 2014-11-24 22:22:47 +00:00
parent 4aead01e34
commit 686f8523e1
4 changed files with 38 additions and 5 deletions

View file

@ -11,10 +11,10 @@
android:title="@string/menu_mark_story_as_read" />
<item android:id="@+id/menu_mark_newer_stories_as_read"
android:title="@string/menu_mark_newer_stories_as_read" />
android:title="@string/menu_newest_mark_newer_stories_as_read" />
<item android:id="@+id/menu_mark_older_stories_as_read"
android:title="@string/menu_mark_older_stories_as_read" />
android:title="@string/menu_newest_mark_older_stories_as_read" />
<item android:id="@+id/menu_save_story"
android:title="@string/menu_save_story" />

View file

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:id="@+id/menu_shared"
android:title="@string/menu_share"/>
<item android:id="@+id/menu_mark_story_as_unread"
android:title="@string/menu_mark_unread" />
<item android:id="@+id/menu_mark_story_as_read"
android:title="@string/menu_mark_story_as_read" />
<item android:id="@+id/menu_mark_older_stories_as_read"
android:title="@string/menu_oldest_mark_older_stories_as_read" />
<item android:id="@+id/menu_mark_newer_stories_as_read"
android:title="@string/menu_oldest_mark_newer_stories_as_read" />
<item android:id="@+id/menu_save_story"
android:title="@string/menu_save_story" />
<item android:id="@+id/menu_unsave_story"
android:title="@string/menu_unsave_story" />
</menu>

View file

@ -102,8 +102,10 @@
<string name="menu_textsize">Adjust text size</string>
<string name="menu_save_story">Save this story</string>
<string name="menu_unsave_story">Unsave this story</string>
<string name="menu_mark_older_stories_as_read">Mark older as read</string>
<string name="menu_mark_newer_stories_as_read">Mark newer as read</string>
<string name="menu_newest_mark_older_stories_as_read">\u21E3 Mark older as read</string>
<string name="menu_newest_mark_newer_stories_as_read">\u21E1 Mark newer as read</string>
<string name="menu_oldest_mark_older_stories_as_read">\u21E1 Mark older as read</string>
<string name="menu_oldest_mark_newer_stories_as_read">\u21E3 Mark newer as read</string>
<string name="menu_mark_story_as_read">Mark as read</string>
<string name="menu_mark_unread">Mark as unread</string>
<string name="menu_fullscreen">Full screen</string>

View file

@ -31,7 +31,9 @@ import com.newsblur.domain.Story;
import com.newsblur.util.DefaultFeedView;
import com.newsblur.util.FeedSet;
import com.newsblur.util.FeedUtils;
import com.newsblur.util.PrefsUtils;
import com.newsblur.util.StateFilter;
import com.newsblur.util.StoryOrder;
public abstract class ItemListFragment extends NbFragment implements OnScrollListener, OnCreateContextMenuListener, LoaderManager.LoaderCallbacks<Cursor>, OnItemClickListener {
@ -179,7 +181,11 @@ public abstract class ItemListFragment extends NbFragment implements OnScrollLis
@Override
public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo) {
MenuInflater inflater = getActivity().getMenuInflater();
inflater.inflate(R.menu.context_story, menu);
if (PrefsUtils.getStoryOrder(activity, getFeedSet()) == StoryOrder.NEWEST) {
inflater.inflate(R.menu.context_story_newest, menu);
} else {
inflater.inflate(R.menu.context_story_oldest, menu);
}
Story story = adapter.getStory(((AdapterView.AdapterContextMenuInfo) (menuInfo)).position);
if (story.read) {