Use a nice title in the reply screen

captchafix
Florens Douwes 11 years ago
parent 7c25618534
commit df375c1034
  1. 19
      Clover/app/src/main/java/org/floens/chan/core/loader/Loader.java
  2. 4
      Clover/app/src/main/java/org/floens/chan/ui/activity/BoardActivity.java
  3. 3
      Clover/app/src/main/java/org/floens/chan/ui/fragment/ReplyFragment.java

@ -17,6 +17,7 @@
*/ */
package org.floens.chan.core.loader; package org.floens.chan.core.loader;
import android.text.TextUtils;
import android.util.SparseArray; import android.util.SparseArray;
import com.android.volley.Response; import com.android.volley.Response;
@ -48,6 +49,7 @@ public class Loader {
private final Loadable loadable; private final Loadable loadable;
private final SparseArray<Post> postsById = new SparseArray<Post>(); private final SparseArray<Post> postsById = new SparseArray<Post>();
private final List<Post> cachedPosts = new ArrayList<Post>(); private final List<Post> cachedPosts = new ArrayList<Post>();
private Post op;
private boolean destroyed = false; private boolean destroyed = false;
private boolean autoReload = false; private boolean autoReload = false;
@ -132,6 +134,7 @@ public class Loader {
currentTimeout = 0; currentTimeout = 0;
cachedPosts.clear(); cachedPosts.clear();
op = null;
request = getData(); request = getData();
} }
@ -183,6 +186,10 @@ public class Loader {
return loadable; return loadable;
} }
public Post getOP() {
return op;
}
/** /**
* Get the time in milliseconds until another loadMore is recommended * Get the time in milliseconds until another loadMore is recommended
* *
@ -286,6 +293,18 @@ public class Loader {
postsById.append(post.no, post); postsById.append(post.no, post);
} }
if (loadable.isThreadMode() && result.size() > 0) {
op = result.get(0);
}
if (TextUtils.isEmpty(loadable.title)) {
if (getOP() != null) {
loadable.generateTitle(getOP());
} else {
loadable.title = "/" + loadable.board + "/";
}
}
for (LoaderListener l : listeners) { for (LoaderListener l : listeners) {
l.onData(result, loadable.isBoardMode()); l.onData(result, loadable.isBoardMode());
} }

@ -27,7 +27,6 @@ import android.content.res.Configuration;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.app.ActionBarDrawerToggle;
import android.text.TextUtils;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.Menu; import android.view.Menu;
@ -276,10 +275,7 @@ public class BoardActivity extends BaseActivity implements AdapterView.OnItemSel
@Override @Override
public void onThreadLoaded(Loadable loadable, List<Post> posts) { public void onThreadLoaded(Loadable loadable, List<Post> posts) {
if (loadable.isThreadMode() && TextUtils.isEmpty(threadLoadable.title) && posts.size() > 0) {
threadLoadable.generateTitle(posts.get(0));
updateActionBarState(); updateActionBarState();
}
pinnedAdapter.notifyDataSetChanged(); pinnedAdapter.notifyDataSetChanged();
} }

@ -128,8 +128,7 @@ public class ReplyFragment extends DialogFragment {
setClosable(true); setClosable(true);
Dialog dialog = getDialog(); Dialog dialog = getDialog();
String title = loadable.isThreadMode() ? context.getString(R.string.reply) + " /" + loadable.board + "/" String title = (loadable.isThreadMode() ? context.getString(R.string.reply) : context.getString(R.string.reply_to_board)) + " " + loadable.title;
+ loadable.no : context.getString(R.string.reply_to_board) + " /" + loadable.board + "/";
if (dialog == null) { if (dialog == null) {
context.getActionBar().setTitle(title); context.getActionBar().setTitle(title);

Loading…
Cancel
Save