Skip to content

fix #448: reader - change the empty view title when fetching articles #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nbradbury merged 4 commits into from
Dec 16, 2013
Merged

fix #448: reader - change the empty view title when fetching articles #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1dc0524
fix #448: reader - change the empty view message when fetching articles
maxme Dec 13, 2013
6ce8e78
s/article/post/ in strings.xml (this word was only used in the reader)
maxme Dec 16, 2013
ed7bf8f
update empty view only when no new article fetched
maxme Dec 16, 2013
1d73346
Merge branch 'develop' into issue/448-reader-empty-page-before-refresh
maxme Dec 16, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,8 @@
<string name="reader_hint_reblog_comment">Optional comment</string>

<!-- TextView labels -->
<string name="reader_label_new_posts_one">One new article</string>
<string name="reader_label_new_posts_multi">%d new articles</string>
<string name="reader_label_new_posts_one">One new post</string>
<string name="reader_label_new_posts_multi">%d new posts</string>
<string name="reader_label_added_tag">Added %s</string>
<string name="reader_label_removed_tag">Removed %s</string>
<string name="reader_label_reblog_to">Reblog this post to</string>
Expand Down Expand Up @@ -637,10 +637,10 @@
<string name="reader_default_tag_name">Freshly Pressed</string>

<!-- empty list/grid text -->
<string name="reader_empty_posts_in_tag">No articles with this&#160;tag.</string>
<string name="reader_empty_posts_in_tag_never_updated">No articles with this tag&#160;yet.</string>
<string name="reader_empty_posts_in_topic">No post in this&#160;topic.</string>
<string name="reader_empty_posts_in_topic_updating">Fetching posts…</string>
<string name="reader_empty_followed_tags">You don\'t follow any&#160;tags.</string>
<string name="reader_empty_popular_tags">No popular tags</string>
<string name="reader_empty_popular_tags">No popular tags.</string>
<string name="reader_empty_followed_blogs_title">You\'re not following any blogs&#160;yet.</string>
<string name="reader_empty_followed_blogs_description">But don\'t worry, just tap the tag icon to start&#160;exploring!</string>
<string name="reader_empty_posts_liked">You have not liked any&#160;posts.</string>
Expand Down
44 changes: 25 additions & 19 deletions src/org/wordpress/android/ui/reader_native/ReaderPostListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,29 +196,30 @@ private void startBoxAndPagesAnimation() {
}

private void setEmptyTitleAndDecriptionForCurrentTag() {
boolean hasTagEverUpdated = ReaderTagTable.hasEverUpdatedTag(mCurrentTag);
if (!isPostAdapterEmpty()) {
return ;
}
int title, description = -1;
int tagIndex = mActionBarAdapter.getIndexOfTagName(mCurrentTag);

final String tagId;
if (tagIndex > -1) {
ReaderTag tag = (ReaderTag) getActionBarAdapter().getItem(tagIndex);
tagId = tag.getStringIdFromEndpoint();
if (isUpdating()) {
title = R.string.reader_empty_posts_in_topic_updating;
} else {
tagId = "";
}
int tagIndex = mActionBarAdapter.getIndexOfTagName(mCurrentTag);

if (tagId.equals("following")) {
title = R.string.reader_empty_followed_blogs_title;
description = R.string.reader_empty_followed_blogs_description;
} else {
if (tagId.equals("liked")) {
title = R.string.reader_empty_posts_liked;
final String tagId;
if (tagIndex > -1) {
ReaderTag tag = (ReaderTag) getActionBarAdapter().getItem(tagIndex);
tagId = tag.getStringIdFromEndpoint();
} else {
if (hasTagEverUpdated) {
title = R.string.reader_empty_posts_in_tag;
tagId = "";
}
if (tagId.equals("following")) {
title = R.string.reader_empty_followed_blogs_title;
description = R.string.reader_empty_followed_blogs_description;
} else {
if (tagId.equals("liked")) {
title = R.string.reader_empty_posts_liked;
} else {
title = R.string.reader_empty_posts_in_tag_never_updated;
title = R.string.reader_empty_posts_in_topic;
}
}
}
Expand Down Expand Up @@ -381,6 +382,8 @@ private void updatePostsWithTag(final String tagName, final ReaderActions.Reques
}

setIsUpdating(true, updateAction);
// update empty view title and description if the the post list is empty
setEmptyTitleAndDecriptionForCurrentTag();

ReaderPostActions.updatePostsWithTag(tagName, updateAction, new ReaderActions.UpdateResultAndCountListener() {
@Override
Expand All @@ -398,6 +401,9 @@ public void onUpdateResult(ReaderActions.UpdateResult result, int numNewPosts) {
} else {
refreshPosts();
}
} else {
// update empty view title and description if the the post list is empty
setEmptyTitleAndDecriptionForCurrentTag();
}
// schedule the next update in this tag
if (result != ReaderActions.UpdateResult.FAILED)
Expand All @@ -409,12 +415,12 @@ public void onUpdateResult(ReaderActions.UpdateResult result, int numNewPosts) {
protected boolean isUpdating() {
return mIsUpdating;
}

protected void setIsUpdating(boolean isUpdating, ReaderActions.RequestDataAction updateAction) {
if (mIsUpdating==isUpdating)
return;
if (!hasActivity())
return;

mIsUpdating = isUpdating;
switch (updateAction) {
case LOAD_NEWER:
Expand Down