cynic
/
Clover
mirror of https://github.com/kurisufriend/Clover
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use a TextView for the PostCell comment again

Browse Source 
Maintaining FastTextView because too much of a mess to maintain
because the post comment uses spannables extensively and the caching
became too difficult.

It is still used for the "n replies" and the date, these have simple requirements.
multisite
Floens 10 years ago
parent 430c0963bd
commit 1a19303418
6 changed files with 68 additions and 46 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Clover/app/src/main/java/org/floens/chan/controller/Controller.java
  2. 5
      Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java
  3. 90
      Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java
  4. 5
      Clover/app/src/main/java/org/floens/chan/ui/text/FastTextView.java
  5. 2
      Clover/app/src/main/java/org/floens/chan/ui/text/FastTextViewMovementMethod.java
  6. 4
      Clover/app/src/main/res/layout/cell_post.xml

2
Clover/app/src/main/java/org/floens/chan/controller/Controller.java
Unescape View File

@ -118,9 +118,11 @@ public abstract class Controller {
}
if (AndroidUtils.removeFromParentView(view)) {
if (LOG_STATES) {
Logger.test(getClass().getSimpleName() + " view removed onDestroy");
}
}
}
public void addChildController(Controller controller) {
childControllers.add(controller);

5
Clover/app/src/main/java/org/floens/chan/controller/ui/NavigationControllerContainerLayout.java
Unescape View File

@ -32,6 +32,7 @@ import android.widget.Scroller;
import org.floens.chan.controller.Controller;
import org.floens.chan.controller.NavigationController;
import org.floens.chan.utils.Time;
public class NavigationControllerContainerLayout extends FrameLayout {
private NavigationController navigationController;
@ -183,12 +184,12 @@ public class NavigationControllerContainerLayout extends FrameLayout {
swipingController = navigationController.getTop();
drawShadow = true;
// long start = Time.startTiming();
long start = Time.startTiming();
Controller below = getBelowTop();
navigationController.beginSwipeTransition(swipingController, below);
// Time.endTiming("attach", start);
Time.endTiming("attach", start);
}
float translationX = Math.max(0, event.getX() - swipeStartEvent.getX());

90
Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java
Unescape View File

@ -36,18 +36,19 @@ import android.text.Spanned;
import android.text.TextPaint;
import android.text.TextUtils;
import android.text.format.DateUtils;
import android.text.method.LinkMovementMethod;
import android.text.style.AbsoluteSizeSpan;
import android.text.style.BackgroundColorSpan;
import android.text.style.ClickableSpan;
import android.text.style.ForegroundColorSpan;
import android.text.style.UnderlineSpan;
import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import com.android.volley.VolleyError;
import com.android.volley.toolbox.ImageLoader;
@ -83,7 +84,7 @@ public class PostCell extends LinearLayout implements PostCellInterface, PostLin
private ThumbnailView thumbnailView;
private FastTextView title;
private PostIcons icons;
private FastTextView comment;
private TextView comment;
private FastTextView replies;
private ImageView options;
private View divider;
@ -94,6 +95,7 @@ public class PostCell extends LinearLayout implements PostCellInterface, PostLin
private int countrySizePx;
private int paddingPx;
private boolean threadMode;
private boolean ignoreNextOnClick;
private boolean bound = false;
private Theme theme;
@ -107,9 +109,15 @@ public class PostCell extends LinearLayout implements PostCellInterface, PostLin
private OnClickListener selfClicked = new OnClickListener() {
@Override
public void onClick(View v) {
if (ignoreNextOnClick) {
ignoreNextOnClick = false;
} else {
callback.onPostClicked(post);
}
}
};
private PostViewMovementMethod commentMovementMethod = new PostViewMovementMethod();
private PostViewFastMovementMethod titleMovementMethod = new PostViewFastMovementMethod();
public PostCell(Context context) {
super(context);
@ -130,7 +138,7 @@ public class PostCell extends LinearLayout implements PostCellInterface, PostLin
thumbnailView = (ThumbnailView) findViewById(R.id.thumbnail_view);
title = (FastTextView) findViewById(R.id.title);
icons = (PostIcons) findViewById(R.id.icons);
comment = (FastTextView) findViewById(R.id.comment);
comment = (TextView) findViewById(R.id.comment);
replies = (FastTextView) findViewById(R.id.replies);
options = (ImageView) findViewById(R.id.options);
divider = findViewById(R.id.divider);
@ -397,18 +405,17 @@ public class PostCell extends LinearLayout implements PostCellInterface, PostLin
commentText = post.comment;
}
comment.setText(new SpannableString(commentText));
comment.setText(commentText);
comment.setVisibility(isEmpty(commentText) && !post.hasImage ? GONE : VISIBLE);
if (commentClickable != threadMode) {
commentClickable = threadMode;
if (commentClickable) {
PostViewMovementMethod movementMethod = new PostViewMovementMethod();
comment.setMovementMethod(movementMethod);
comment.setMovementMethod(commentMovementMethod);
comment.setOnClickListener(selfClicked);
if (noClickable) {
title.setMovementMethod(movementMethod);
title.setMovementMethod(titleMovementMethod);
}
} else {
comment.setOnClickListener(null);
@ -494,17 +501,17 @@ public class PostCell extends LinearLayout implements PostCellInterface, PostLin
* A MovementMethod that searches for PostLinkables.<br>
* See {@link PostLinkable} for more information.
*/
private class PostViewMovementMethod implements FastTextViewMovementMethod {
private class PostViewMovementMethod extends LinkMovementMethod {
@Override
public boolean onTouchEvent(@NonNull FastTextView widget, @NonNull Spanned buffer, @NonNull Spanned cachedBuffer, @NonNull MotionEvent event) {
public boolean onTouchEvent(@NonNull TextView widget, @NonNull Spannable buffer, @NonNull MotionEvent event) {
int action = event.getActionMasked();
if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_CANCEL || action == MotionEvent.ACTION_DOWN) {
int x = (int) event.getX();
int y = (int) event.getY();
x -= widget.getPaddingLeft();
y -= widget.getPaddingTop();
x -= widget.getTotalPaddingLeft();
y -= widget.getTotalPaddingTop();
x += widget.getScrollX();
y += widget.getScrollY();
@ -517,45 +524,58 @@ public class PostCell extends LinearLayout implements PostCellInterface, PostLin
if (link.length != 0) {
if (action == MotionEvent.ACTION_UP) {
ignoreNextOnClick = true;
link[0].onClick(widget);
removeBackgroundSpan(widget, cachedBuffer);
buffer.removeSpan(BACKGROUND_SPAN);
} else if (action == MotionEvent.ACTION_DOWN && link[0] instanceof PostLinkable) {
int spanStart = buffer.getSpanStart(link[0]);
int spanEnd = buffer.getSpanEnd(link[0]);
// Set the buffer on the visible buffer, not on the functional buffer
// This is because the visible buffer may be a cached one or may be in use multiple times
if (spanStart <= spanEnd && spanStart >= 0 && spanEnd >= 0 && spanStart <= cachedBuffer.length() && spanEnd <= cachedBuffer.length()) {
showBackgroundSpan(widget, cachedBuffer, spanStart, spanEnd);
} else {
Log.e(TAG, "Could not add the background span because it was out of range!");
}
buffer.setSpan(BACKGROUND_SPAN, buffer.getSpanStart(link[0]), buffer.getSpanEnd(link[0]), 0);
} else if (action == MotionEvent.ACTION_CANCEL) {
removeBackgroundSpan(widget, cachedBuffer);
buffer.removeSpan(BACKGROUND_SPAN);
}
return true;
} else {
removeBackgroundSpan(widget, cachedBuffer);
return false;
buffer.removeSpan(BACKGROUND_SPAN);
}
}
return false;
return true;
}
}
/**
* A MovementMethod that searches for PostLinkables.<br>
* This version is for the {@link FastTextView}.<br>
* See {@link PostLinkable} for more information.
*/
private class PostViewFastMovementMethod implements FastTextViewMovementMethod {
@Override
public boolean onTouchEvent(@NonNull FastTextView widget, @NonNull Spanned buffer, @NonNull MotionEvent event) {
int action = event.getActionMasked();
private void showBackgroundSpan(FastTextView widget, Spanned buffer, int start, int end) {
if (buffer instanceof Spannable) {
((Spannable) buffer).setSpan(BACKGROUND_SPAN, start, end, 0);
widget.invalidate();
if (action == MotionEvent.ACTION_UP) {
int x = (int) event.getX();
int y = (int) event.getY();
x -= widget.getPaddingLeft();
y -= widget.getPaddingTop();
x += widget.getScrollX();
y += widget.getScrollY();
Layout layout = widget.getLayout();
int line = layout.getLineForVertical(y);
int off = layout.getOffsetForHorizontal(line, x);
ClickableSpan[] link = buffer.getSpans(off, off, ClickableSpan.class);
if (link.length != 0) {
link[0].onClick(widget);
return true;
}
}
private void removeBackgroundSpan(FastTextView widget, Spanned buffer) {
if (buffer instanceof Spannable) {
((Spannable) buffer).removeSpan(BACKGROUND_SPAN);
widget.invalidate();
}
return false;
}
}

5
Clover/app/src/main/java/org/floens/chan/ui/text/FastTextView.java
Unescape View File

@ -32,14 +32,13 @@ import android.view.MotionEvent;
import android.view.View;
import org.floens.chan.R;
import org.floens.chan.ui.cell.PostCell;
import org.floens.chan.utils.Logger;
import static org.floens.chan.utils.AndroidUtils.sp;
/**
* A simple implementation of a TextView that caches the used StaticLayouts for performance.<br>
* This view was made for {@link PostCell} and may have untested behaviour with other layouts.
* This view was made for {@link org.floens.chan.ui.cell.PostCell} and {@link org.floens.chan.ui.cell.CardPostCell }and may have untested behaviour with other layouts.
*/
public class FastTextView extends View {
private static final String TAG = "FastTextView";
@ -130,7 +129,7 @@ public class FastTextView extends View {
boolean handled = false;
if (movementMethod != null && text instanceof Spanned && layout != null && isEnabled()) {
handled |= movementMethod.onTouchEvent(this, (Spanned) text, (Spanned) layout.getText(), event);
handled |= movementMethod.onTouchEvent(this, (Spanned) text, event);
}
return handled || super.onTouchEvent(event);

2
Clover/app/src/main/java/org/floens/chan/ui/text/FastTextViewMovementMethod.java
Unescape View File

@ -21,5 +21,5 @@ import android.text.Spanned;
import android.view.MotionEvent;
public interface FastTextViewMovementMethod {
boolean onTouchEvent(FastTextView widget, Spanned buffer, Spanned cachedBuffer, MotionEvent event);
boolean onTouchEvent(FastTextView widget, Spanned buffer, MotionEvent event);
}

4
Clover/app/src/main/res/layout/cell_post.xml
Unescape View File

@ -61,7 +61,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_below="@id/title"
android:layout_toRightOf="@id/thumbnail_view" />
<org.floens.chan.ui.text.FastTextView
<TextView
android:id="@+id/comment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -69,7 +69,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_alignWithParentIfMissing="true"
android:layout_below="@id/icons"
android:layout_toRightOf="@id/thumbnail_view"
app:textColor="?attr/text_color_primary" />
android:textColor="?attr/text_color_primary" />
<org.floens.chan.ui.text.FastTextView
android:id="@+id/replies"

Write Preview
Loading…
Cancel
Save