Create text subpackage in util

TeamNewPipe · Jan 15, 2023 · 22c201b · 22c201b
1 parent cdd5e89
commit 22c201b
Show file tree

Hide file tree

Showing 14 changed files with 23 additions and 25 deletions.
diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/DescriptionFragment.java
@@ -29,7 +29,7 @@
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.external_communication.TextLinkifier;
+import org.schabi.newpipe.util.text.TextLinkifier;
 
 import icepick.State;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;

diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java
@@ -20,13 +20,13 @@
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem;
 import org.schabi.newpipe.info_list.InfoItemBuilder;
 import org.schabi.newpipe.local.history.HistoryRecordManager;
-import org.schabi.newpipe.util.CommentTextOnTouchListener;
+import org.schabi.newpipe.util.text.CommentTextOnTouchListener;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.external_communication.TimestampExtractor;
+import org.schabi.newpipe.util.text.TimestampExtractor;
 
 import java.util.Objects;
 

diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java
@@ -51,7 +51,7 @@
 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;

diff --git a/...pipe/util/CommentTextOnTouchListener.java → ...util/text/CommentTextOnTouchListener.java b/...pipe/util/CommentTextOnTouchListener.java → ...util/text/CommentTextOnTouchListener.java
@@ -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.widget.TextView;
 
 import org.schabi.newpipe.util.external_communication.ShareUtils;
-import org.schabi.newpipe.util.external_communication.InternalUrlsHandler;
 
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 

diff --git a/...cation/HashtagLongPressClickableSpan.java → ...l/text/HashtagLongPressClickableSpan.java b/...cation/HashtagLongPressClickableSpan.java → ...l/text/HashtagLongPressClickableSpan.java
@@ -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 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 {
 

diff --git a/...al_communication/InternalUrlsHandler.java → ...ewpipe/util/text/InternalUrlsHandler.java b/...al_communication/InternalUrlsHandler.java → ...ewpipe/util/text/InternalUrlsHandler.java
@@ -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;

diff --git a/...newpipe/views/LongPressClickableSpan.java → ...ipe/util/text/LongPressClickableSpan.java b/...newpipe/views/LongPressClickableSpan.java → ...ipe/util/text/LongPressClickableSpan.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.views;
+package org.schabi.newpipe.util.text;
 
 import android.text.style.ClickableSpan;
 import android.view.View;

diff --git a/...pe/views/LongPressLinkMovementMethod.java → ...til/text/LongPressLinkMovementMethod.java b/...pe/views/LongPressLinkMovementMethod.java → ...til/text/LongPressLinkMovementMethod.java
@@ -1,6 +1,6 @@
-package org.schabi.newpipe.views;
+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.os.Handler;
 import android.os.Looper;

diff --git a/...external_communication/TextLinkifier.java → ...habi/newpipe/util/text/TextLinkifier.java b/...external_communication/TextLinkifier.java → ...habi/newpipe/util/text/TextLinkifier.java
@@ -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 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 static void createLinksFromPlainText(@NonNull final TextView textView,
                                                 @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);
     }
 
     /**

diff --git a/...nal_communication/TimestampExtractor.java → ...newpipe/util/text/TimestampExtractor.java b/...nal_communication/TimestampExtractor.java → ...newpipe/util/text/TimestampExtractor.java
@@ -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;

diff --git a/...tion/TimestampLongPressClickableSpan.java → ...text/TimestampLongPressClickableSpan.java b/...tion/TimestampLongPressClickableSpan.java → ...text/TimestampLongPressClickableSpan.java
@@ -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 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;
 

diff --git a/...a/org/schabi/newpipe/util/TouchUtils.java → .../schabi/newpipe/util/text/TouchUtils.java b/...a/org/schabi/newpipe/util/TouchUtils.java → .../schabi/newpipe/util/text/TouchUtils.java
@@ -1,4 +1,4 @@
-package org.schabi.newpipe.util;
+package org.schabi.newpipe.util.text;
 
 import android.text.Layout;
 import android.view.MotionEvent;

diff --git a/...munication/UrlLongPressClickableSpan.java → .../util/text/UrlLongPressClickableSpan.java b/...munication/UrlLongPressClickableSpan.java → .../util/text/UrlLongPressClickableSpan.java
@@ -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;
 

diff --git a/app/src/test/java/org/schabi/newpipe/util/external_communication/TimestampExtractorTest.java b/app/src/test/java/org/schabi/newpipe/util/external_communication/TimestampExtractorTest.java
@@ -3,6 +3,7 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
+import org.schabi.newpipe.util.text.TimestampExtractor;
 
 import java.time.Duration;
 import java.util.Arrays;