captchafix
Florens Douwes 12 years ago
parent fbefe1ed33
commit 422e496dd7
  1. 2
      Chan/src/org/floens/chan/adapter/PostAdapter.java
  2. 4
      Chan/src/org/floens/chan/fragment/ThreadFragment.java
  3. 10
      Chan/src/org/floens/chan/loader/Loader.java
  4. 2
      Chan/src/org/floens/chan/loader/LoaderPool.java
  5. 6
      Chan/src/org/floens/chan/manager/ThreadManager.java
  6. 2
      Chan/src/org/floens/chan/watch/PinWatcher.java
  7. 4
      docs/Loading.txt

@ -80,7 +80,7 @@ public class PostAdapter extends BaseAdapter {
} }
private View createThreadEndView() { private View createThreadEndView() {
if (false/* && threadManager.getWatchLogic() != null*/) { if (threadManager.getLoadable().isThreadMode()) {
ThreadWatchCounterView view = new ThreadWatchCounterView(context); ThreadWatchCounterView view = new ThreadWatchCounterView(context);
Utils.setPressedDrawable(view); Utils.setPressedDrawable(view);
view.init(threadManager, listView, this); view.init(threadManager, listView, this);

@ -120,7 +120,7 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
} }
@Override @Override
public void onThreadLoaded(List<Post> posts) { public void onThreadLoaded(List<Post> posts, boolean append) {
if (postAdapter == null) { if (postAdapter == null) {
listView = new ListView(baseActivity); listView = new ListView(baseActivity);
@ -151,7 +151,7 @@ public class ThreadFragment extends Fragment implements ThreadManager.ThreadMana
} }
} }
if (loadable.isBoardMode()) { if (append) {
postAdapter.addList(posts); postAdapter.addList(posts);
} else { } else {
postAdapter.setList(posts); postAdapter.setList(posts);

@ -75,6 +75,12 @@ public class Loader {
request.cancel(); request.cancel();
} }
request = getData(loadable);
} else if (loadable.isThreadMode()) {
if (request != null) {
return;
}
request = getData(loadable); request = getData(loadable);
} }
} }
@ -124,7 +130,7 @@ public class Loader {
} }
for (LoaderListener l : listeners) { for (LoaderListener l : listeners) {
l.onData(result); l.onData(result, loadable.isBoardMode());
} }
} }
@ -144,7 +150,7 @@ public class Loader {
} }
public static interface LoaderListener { public static interface LoaderListener {
public void onData(List<Post> result); public void onData(List<Post> result, boolean append);
public void onError(VolleyError error); public void onError(VolleyError error);
} }
} }

@ -41,7 +41,7 @@ public class LoaderPool {
} }
if (loader.removeListener(listener)) { if (loader.removeListener(listener)) {
loaders.remove(loader); loaders.remove(loader.getLoadable());
} }
} }
} }

@ -117,8 +117,8 @@ public class ThreadManager implements Loader.LoaderListener {
} }
@Override @Override
public void onData(List<Post> result) { public void onData(List<Post> result, boolean append) {
threadManagerListener.onThreadLoaded(result); threadManagerListener.onThreadLoaded(result, append);
} }
public boolean hasLoader() { public boolean hasLoader() {
@ -498,7 +498,7 @@ public class ThreadManager implements Loader.LoaderListener {
} }
public interface ThreadManagerListener { public interface ThreadManagerListener {
public void onThreadLoaded(List<Post> result); public void onThreadLoaded(List<Post> result, boolean append);
public void onThreadLoadError(VolleyError error); public void onThreadLoadError(VolleyError error);
public void onOPClicked(Post post); public void onOPClicked(Post post);
public void onThumbnailClicked(Post post); public void onThumbnailClicked(Post post);

@ -48,7 +48,7 @@ public class PinWatcher implements Loader.LoaderListener {
} }
@Override @Override
public void onData(List<Post> result) { public void onData(List<Post> result, boolean append) {
int count = result.size(); int count = result.size();
Logger.test("PinWatcher onData"); Logger.test("PinWatcher onData");

@ -8,9 +8,9 @@ void release(Loader):
Loader: Loader:
void destroy(): void destroy():
void request(): void requestData():
load from beginning load from beginning
void onBottomReached(): void requestNextData():
board: load next page board: load next page
thread: reset new counter thread: reset new counter
int getUnread(): int getUnread():

Loading…
Cancel
Save