Added "tap to refresh" for when auto refresh is disabled.

captchafix
Florens Douwes 11 years ago
parent f8878f8fbb
commit 98b8b8d369
  1. 27
      Clover/app/src/main/java/org/floens/chan/ui/adapter/PostAdapter.java
  2. 4
      Clover/app/src/main/java/org/floens/chan/ui/fragment/ThreadFragment.java
  3. 3
      Clover/app/src/main/res/values/strings.xml

@ -71,7 +71,7 @@ public class PostAdapter extends BaseAdapter implements Filterable {
private boolean endOfLine; private boolean endOfLine;
private int lastPostCount = 0; private int lastPostCount = 0;
private long lastViewedTime = 0; private long lastViewedTime = 0;
private String loadMessage = null; private String statusMessage = null;
private String filter = ""; private String filter = "";
private int pendingScrollToPost = -1; private int pendingScrollToPost = -1;
@ -280,12 +280,12 @@ public class PostAdapter extends BaseAdapter implements Filterable {
} }
} }
public void setErrorMessage(String loadMessage) { public void setStatusMessage(String loadMessage) {
this.loadMessage = loadMessage; this.statusMessage = loadMessage;
} }
public String getErrorMessage() { public String getStatusMessage() {
return loadMessage; return statusMessage;
} }
private void onGetBottomView() { private void onGetBottomView() {
@ -348,19 +348,17 @@ public class PostAdapter extends BaseAdapter implements Filterable {
setGravity(Gravity.CENTER); setGravity(Gravity.CENTER);
Loadable loadable = loader.getLoadable(); Loadable loadable = loader.getLoadable();
if (loadable.isThreadMode()) { if (loadable.isThreadMode()) {
if (threadManager.shouldWatch()) { String error = getStatusMessage();
String error = getErrorMessage();
if (error != null) { if (error != null) {
setText(error); setText(error);
} else { } else {
if (threadManager.shouldWatch()) {
long time = loader.getTimeUntilLoadMore() / 1000L; long time = loader.getTimeUntilLoadMore() / 1000L;
if (time == 0) { if (time == 0) {
setText("Loading"); setText(context.getString(R.string.thread_refresh_now));
} else { } else {
setText("Loading in " + time); setText(context.getString(R.string.thread_refresh_countdown, time));
}
} }
new Handler().postDelayed(new Runnable() { new Handler().postDelayed(new Runnable() {
@ -371,6 +369,9 @@ public class PostAdapter extends BaseAdapter implements Filterable {
} }
} }
}, 1000); }, 1000);
} else {
setText(context.getString(R.string.thread_refresh_bar_inactive));
}
setOnClickListener(new OnClickListener() { setOnClickListener(new OnClickListener() {
@Override @Override
@ -383,11 +384,9 @@ public class PostAdapter extends BaseAdapter implements Filterable {
notifyDataSetChanged(); notifyDataSetChanged();
} }
}); });
}
Utils.setPressedDrawable(this); Utils.setPressedDrawable(this);
} else {
setText("");
}
} else if (loadable.isBoardMode()) { } else if (loadable.isBoardMode()) {
if (endOfLine) { if (endOfLine) {
setText(context.getString(R.string.thread_load_end_of_line)); setText(context.getString(R.string.thread_load_end_of_line));

@ -295,7 +295,7 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
} }
} }
postAdapter.setErrorMessage(null); postAdapter.setStatusMessage(null);
if (append) { if (append) {
postAdapter.appendList(posts); postAdapter.appendList(posts);
@ -322,7 +322,7 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
container.setView(getLoadErrorTextView(error)); container.setView(getLoadErrorTextView(error));
} }
} else { } else {
postAdapter.setErrorMessage(getLoadErrorText(error)); postAdapter.setStatusMessage(getLoadErrorText(error));
} }
} }

@ -66,6 +66,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
<string name="thread_load_failed_parsing">Server inaccessible</string> <string name="thread_load_failed_parsing">Server inaccessible</string>
<string name="thread_load_failed_server">404 not found</string> <string name="thread_load_failed_server">404 not found</string>
<string name="thread_load_end_of_line">No more posts</string> <string name="thread_load_end_of_line">No more posts</string>
<string name="thread_refresh_bar_inactive">Tap to refresh</string>
<string name="thread_refresh_now">Loading</string>
<string name="thread_refresh_countdown">Loading in %1$d</string>
<string name="board_edit">Board editor</string> <string name="board_edit">Board editor</string>
<string name="board_add">Add board</string> <string name="board_add">Add board</string>

Loading…
Cancel
Save