Remove black spoiler when you click on them

captchafix
Floens 11 years ago
parent 2f04375511
commit 0b0f878f0f
  1. 2
      Clover/app/src/main/java/org/floens/chan/core/manager/ThreadManager.java
  2. 5
      Clover/app/src/main/java/org/floens/chan/core/model/PostLinkable.java
  3. 9
      Clover/app/src/main/java/org/floens/chan/ui/view/PostView.java

@ -449,8 +449,6 @@ public class ThreadManager implements Loader.LoaderListener {
} else { } else {
Utils.openLink(activity, (String) linkable.value); Utils.openLink(activity, (String) linkable.value);
} }
} else if (linkable.type == PostLinkable.Type.SPOILER) {
new AlertDialog.Builder(activity).setMessage((String) linkable.value).show();
} else if (linkable.type == PostLinkable.Type.THREAD) { } else if (linkable.type == PostLinkable.Type.THREAD) {
final PostLinkable.ThreadLink link = (PostLinkable.ThreadLink) linkable.value; final PostLinkable.ThreadLink link = (PostLinkable.ThreadLink) linkable.value;
final Loadable thread = new Loadable(link.board, link.threadId); final Loadable thread = new Loadable(link.board, link.threadId);

@ -36,6 +36,8 @@ public class PostLinkable extends ClickableSpan {
public final Object value; public final Object value;
public final Type type; public final Type type;
private boolean clicked = false;
public PostLinkable(Post post, String key, Object value, Type type) { public PostLinkable(Post post, String key, Object value, Type type) {
this.post = post; this.post = post;
this.key = key; this.key = key;
@ -48,6 +50,7 @@ public class PostLinkable extends ClickableSpan {
if (post.getLinkableListener() != null) { if (post.getLinkableListener() != null) {
post.getLinkableListener().onLinkableClick(this); post.getLinkableListener().onLinkableClick(this);
} }
clicked = true;
} }
@Override @Override
@ -56,11 +59,13 @@ public class PostLinkable extends ClickableSpan {
ds.setColor(type == Type.LINK ? ThemeHelper.getInstance().getLinkColor() : ThemeHelper.getInstance().getQuoteColor()); ds.setColor(type == Type.LINK ? ThemeHelper.getInstance().getLinkColor() : ThemeHelper.getInstance().getQuoteColor());
ds.setUnderlineText(true); ds.setUnderlineText(true);
} else if (type == Type.SPOILER) { } else if (type == Type.SPOILER) {
if (!clicked) {
ds.setColor(ThemeHelper.getInstance().getSpoilerColor()); ds.setColor(ThemeHelper.getInstance().getSpoilerColor());
ds.bgColor = ThemeHelper.getInstance().getSpoilerColor(); ds.bgColor = ThemeHelper.getInstance().getSpoilerColor();
ds.setUnderlineText(false); ds.setUnderlineText(false);
} }
} }
}
public static class ThreadLink { public static class ThreadLink {
public String board; public String board;

@ -21,7 +21,6 @@ import android.app.Activity;
import android.content.Context; import android.content.Context;
import android.content.res.TypedArray; import android.content.res.TypedArray;
import android.text.Layout; import android.text.Layout;
import android.text.Selection;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.TextUtils; import android.text.TextUtils;
@ -476,14 +475,12 @@ public class PostView extends LinearLayout implements View.OnClickListener {
if (link.length != 0) { if (link.length != 0) {
if (action == MotionEvent.ACTION_UP) { if (action == MotionEvent.ACTION_UP) {
link[0].onClick(widget); link[0].onClick(widget);
} else if (action == MotionEvent.ACTION_DOWN) {
Selection.setSelection(buffer, buffer.getSpanStart(link[0]), buffer.getSpanEnd(link[0]));
} }
commentView.invalidate();
return true; return true;
} else { } else {
Selection.removeSelection(buffer);
// Changed this to propagate events // Changed this to propagate events
PostView.this.onTouchEvent(event); PostView.this.onTouchEvent(event);
return true; return true;
@ -492,8 +489,6 @@ public class PostView extends LinearLayout implements View.OnClickListener {
PostView.this.onTouchEvent(event); PostView.this.onTouchEvent(event);
return true; return true;
} }
// return Touch.onTouchEvent(widget, buffer, event);
} }
} }
} }

Loading…
Cancel
Save