Sulkta-OSS/straw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Create text subpackage in util

Browse source
This commit is contained in:
Stypox 2023-01-15 11:51:07 +01:00
parent cdd5e89b86
commit 22c201be39
No known key found for this signature in database
GPG key ID: 4BDF1B40A49FDD23
14 changed files with 23 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
View file

@ -51,7 +51,7 @@ import org.schabi.newpipe.extractor.search.SearchInfo;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.extractor.stream.StreamInfoItem;
import org.schabi.newpipe.extractor.suggestion.SuggestionExtractor;
import org.schabi.newpipe.util.external_communication.TextLinkifier;
import org.schabi.newpipe.util.text.TextLinkifier;
import java.util.Collections;
import java.util.List;

5
app/src/main/java/org/schabi/newpipe/util/CommentTextOnTouchListener.java → app/src/main/java/org/schabi/newpipe/util/text/CommentTextOnTouchListener.java
View file

@ -1,6 +1,6 @@
package org.schabi.newpipe.util;
package org.schabi.newpipe.util.text;
import static org.schabi.newpipe.util.TouchUtils.getOffsetForHorizontalLine;
import static org.schabi.newpipe.util.text.TouchUtils.getOffsetForHorizontalLine;
import android.text.Selection;
import android.text.Spannable;
@ -12,7 +12,6 @@ import android.view.View;
import android.widget.TextView;
import org.schabi.newpipe.util.external_communication.ShareUtils;
import org.schabi.newpipe.util.external_communication.InternalUrlsHandler;
import io.reactivex.rxjava3.disposables.CompositeDisposable;

4
app/src/main/java/org/schabi/newpipe/util/external_communication/HashtagLongPressClickableSpan.java → app/src/main/java/org/schabi/newpipe/util/text/HashtagLongPressClickableSpan.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.util.external_communication;
package org.schabi.newpipe.util.text;
import android.content.Context;
import android.view.View;
@ -7,7 +7,7 @@ import androidx.annotation.NonNull;
import org.schabi.newpipe.extractor.Info;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.views.LongPressClickableSpan;
import org.schabi.newpipe.util.external_communication.ShareUtils;
final class HashtagLongPressClickableSpan extends LongPressClickableSpan {

2
app/src/main/java/org/schabi/newpipe/util/external_communication/InternalUrlsHandler.java → app/src/main/java/org/schabi/newpipe/util/text/InternalUrlsHandler.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.util.external_communication;
package org.schabi.newpipe.util.text;
import android.content.Context;
import android.util.Log;

12
app/src/main/java/org/schabi/newpipe/util/text/LongPressClickableSpan.java Normal file
View file

@ -0,0 +1,12 @@
package org.schabi.newpipe.util.text;
import android.text.style.ClickableSpan;
import android.view.View;
import androidx.annotation.NonNull;
public abstract class LongPressClickableSpan extends ClickableSpan {
public abstract void onLongClick(@NonNull View view);
}

77
app/src/main/java/org/schabi/newpipe/util/text/LongPressLinkMovementMethod.java Normal file
View file

@ -0,0 +1,77 @@
package org.schabi.newpipe.util.text;
import static org.schabi.newpipe.util.text.TouchUtils.getOffsetForHorizontalLine;
import android.os.Handler;
import android.os.Looper;
import android.text.Selection;
import android.text.Spannable;
import android.text.method.LinkMovementMethod;
import android.text.method.MovementMethod;
import android.view.MotionEvent;
import android.view.ViewConfiguration;
import android.widget.TextView;
import androidx.annotation.NonNull;
// Class adapted from https://stackoverflow.com/a/31786969
public class LongPressLinkMovementMethod extends LinkMovementMethod {
private static final int LONG_PRESS_TIME = ViewConfiguration.getLongPressTimeout();
private static LongPressLinkMovementMethod instance;
private Handler longClickHandler;
private boolean isLongPressed = false;
@Override
public boolean onTouchEvent(@NonNull final TextView widget,
@NonNull final Spannable buffer,
@NonNull final MotionEvent event) {
final int action = event.getAction();
if (action == MotionEvent.ACTION_CANCEL && longClickHandler != null) {
longClickHandler.removeCallbacksAndMessages(null);
}
if (action == MotionEvent.ACTION_UP || action == MotionEvent.ACTION_DOWN) {
final int offset = getOffsetForHorizontalLine(widget, event);
final LongPressClickableSpan[] link = buffer.getSpans(offset, offset,
LongPressClickableSpan.class);
if (link.length != 0) {
if (action == MotionEvent.ACTION_UP) {
if (longClickHandler != null) {
longClickHandler.removeCallbacksAndMessages(null);
}
if (!isLongPressed) {
link[0].onClick(widget);
}
isLongPressed = false;
} else {
Selection.setSelection(buffer, buffer.getSpanStart(link[0]),
buffer.getSpanEnd(link[0]));
if (longClickHandler != null) {
longClickHandler.postDelayed(() -> {
link[0].onLongClick(widget);
isLongPressed = true;
}, LONG_PRESS_TIME);
}
}
return true;
}
}
return super.onTouchEvent(widget, buffer, event);
}
public static MovementMethod getInstance() {
if (instance == null) {
instance = new LongPressLinkMovementMethod();
instance.longClickHandler = new Handler(Looper.myLooper());
}
return instance;
}
}

8
app/src/main/java/org/schabi/newpipe/util/external_communication/TextLinkifier.java → app/src/main/java/org/schabi/newpipe/util/text/TextLinkifier.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.util.external_communication;
package org.schabi.newpipe.util.text;
import android.content.Context;
import android.text.SpannableStringBuilder;
@ -15,8 +15,7 @@ import androidx.core.text.HtmlCompat;
import org.schabi.newpipe.extractor.Info;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.util.NavigationHelper;
import org.schabi.newpipe.views.LongPressClickableSpan;
import org.schabi.newpipe.views.LongPressLinkMovementMethod;
import org.schabi.newpipe.util.external_communication.ShareUtils;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -88,8 +87,7 @@ public final class TextLinkifier {
@NonNull final CompositeDisposable disposables) {
textView.setAutoLinkMask(Linkify.WEB_URLS);
textView.setText(plainTextBlock, TextView.BufferType.SPANNABLE);
changeIntentsOfDescriptionLinks(textView, textView.getText(), relatedInfo, disposables
);
changeIntentsOfDescriptionLinks(textView, textView.getText(), relatedInfo, disposables);
}
/**

2
app/src/main/java/org/schabi/newpipe/util/external_communication/TimestampExtractor.java → app/src/main/java/org/schabi/newpipe/util/text/TimestampExtractor.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.util.external_communication;
package org.schabi.newpipe.util.text;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;

6
app/src/main/java/org/schabi/newpipe/util/external_communication/TimestampLongPressClickableSpan.java → app/src/main/java/org/schabi/newpipe/util/text/TimestampLongPressClickableSpan.java
View file

@ -1,6 +1,6 @@
package org.schabi.newpipe.util.external_communication;
package org.schabi.newpipe.util.text;
import static org.schabi.newpipe.util.external_communication.InternalUrlsHandler.playOnPopup;
import static org.schabi.newpipe.util.text.InternalUrlsHandler.playOnPopup;
import android.content.Context;
import android.view.View;
@ -10,7 +10,7 @@ import androidx.annotation.NonNull;
import org.schabi.newpipe.extractor.ServiceList;
import org.schabi.newpipe.extractor.StreamingService;
import org.schabi.newpipe.extractor.stream.StreamInfo;
import org.schabi.newpipe.views.LongPressClickableSpan;
import org.schabi.newpipe.util.external_communication.ShareUtils;
import io.reactivex.rxjava3.disposables.CompositeDisposable;

2
app/src/main/java/org/schabi/newpipe/util/TouchUtils.java → app/src/main/java/org/schabi/newpipe/util/text/TouchUtils.java
View file

@ -1,4 +1,4 @@
package org.schabi.newpipe.util;
package org.schabi.newpipe.util.text;
import android.text.Layout;
import android.view.MotionEvent;

4
app/src/main/java/org/schabi/newpipe/util/external_communication/UrlLongPressClickableSpan.java → app/src/main/java/org/schabi/newpipe/util/text/UrlLongPressClickableSpan.java
View file

@ -1,11 +1,11 @@
package org.schabi.newpipe.util.external_communication;
package org.schabi.newpipe.util.text;
import android.content.Context;
import android.view.View;
import androidx.annotation.NonNull;
import org.schabi.newpipe.views.LongPressClickableSpan;
import org.schabi.newpipe.util.external_communication.ShareUtils;
import io.reactivex.rxjava3.disposables.CompositeDisposable;