diff --git a/app/src/main/java/app/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch.java b/app/src/main/java/app/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch.java index 75bb5bf5..8c797f69 100644 --- a/app/src/main/java/app/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch.java +++ b/app/src/main/java/app/revanced/integrations/all/connectivity/wifi/spoof/SpoofWifiPatch.java @@ -2,14 +2,9 @@ package app.revanced.integrations.all.connectivity.wifi.spoof; import android.app.PendingIntent; import android.content.Context; -import android.net.ConnectivityManager; -import android.net.Network; -import android.net.NetworkCapabilities; -import android.net.NetworkInfo; -import android.net.NetworkRequest; +import android.net.*; import android.os.Build; import android.os.Handler; - import androidx.annotation.RequiresApi; public class SpoofWifiPatch { diff --git a/app/src/main/java/app/revanced/integrations/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java b/app/src/main/java/app/revanced/integrations/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java index c76d395d..8f489347 100644 --- a/app/src/main/java/app/revanced/integrations/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java +++ b/app/src/main/java/app/revanced/integrations/all/screencapture/removerestriction/RemoveScreencaptureRestrictionPatch.java @@ -2,7 +2,6 @@ package app.revanced.integrations.all.screencapture.removerestriction; import android.media.AudioAttributes; import android.os.Build; - import androidx.annotation.RequiresApi; public final class RemoveScreencaptureRestrictionPatch { diff --git a/app/src/main/java/app/revanced/integrations/reddit/patches/FilterPromotedLinksPatch.java b/app/src/main/java/app/revanced/integrations/reddit/patches/FilterPromotedLinksPatch.java index de8469e2..6b731deb 100644 --- a/app/src/main/java/app/revanced/integrations/reddit/patches/FilterPromotedLinksPatch.java +++ b/app/src/main/java/app/revanced/integrations/reddit/patches/FilterPromotedLinksPatch.java @@ -1,10 +1,10 @@ package app.revanced.integrations.reddit.patches; -import com.reddit.domain.model.ILink; - import java.util.ArrayList; import java.util.List; +import com.reddit.domain.model.ILink; + public final class FilterPromotedLinksPatch { /** * Filters list from promoted links. diff --git a/app/src/main/java/app/revanced/integrations/shared/GmsCoreSupport.java b/app/src/main/java/app/revanced/integrations/shared/GmsCoreSupport.java index bab1a994..da96d367 100644 --- a/app/src/main/java/app/revanced/integrations/shared/GmsCoreSupport.java +++ b/app/src/main/java/app/revanced/integrations/shared/GmsCoreSupport.java @@ -1,5 +1,10 @@ package app.revanced.integrations.shared; +import static app.revanced.integrations.shared.StringRef.str; + +import java.net.MalformedURLException; +import java.net.URL; + import android.app.Activity; import android.app.AlertDialog; import android.app.SearchManager; @@ -11,11 +16,6 @@ import android.os.Build; import android.os.PowerManager; import androidx.annotation.RequiresApi; -import java.net.MalformedURLException; -import java.net.URL; - -import static app.revanced.integrations.shared.StringRef.str; - /** * @noinspection unused */ diff --git a/app/src/main/java/app/revanced/integrations/shared/Logger.java b/app/src/main/java/app/revanced/integrations/shared/Logger.java index 25885050..8ff12835 100644 --- a/app/src/main/java/app/revanced/integrations/shared/Logger.java +++ b/app/src/main/java/app/revanced/integrations/shared/Logger.java @@ -1,17 +1,13 @@ package app.revanced.integrations.shared; -import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG; -import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG_STACKTRACE; -import static app.revanced.integrations.shared.settings.BaseSettings.DEBUG_TOAST_ON_ERROR; - -import android.util.Log; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import static app.revanced.integrations.shared.settings.BaseSettings.*; import java.io.PrintWriter; import java.io.StringWriter; +import android.util.Log; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import app.revanced.integrations.shared.settings.BaseSettings; public class Logger { diff --git a/app/src/main/java/app/revanced/integrations/shared/StringRef.java b/app/src/main/java/app/revanced/integrations/shared/StringRef.java index 2c3b9110..29d7a2f2 100644 --- a/app/src/main/java/app/revanced/integrations/shared/StringRef.java +++ b/app/src/main/java/app/revanced/integrations/shared/StringRef.java @@ -1,14 +1,13 @@ package app.revanced.integrations.shared; -import android.content.Context; -import android.content.res.Resources; - -import androidx.annotation.NonNull; - import java.util.Collections; import java.util.HashMap; import java.util.Map; +import android.content.Context; +import android.content.res.Resources; +import androidx.annotation.NonNull; + public class StringRef { private static Resources resources; private static String packageName; diff --git a/app/src/main/java/app/revanced/integrations/shared/Utils.java b/app/src/main/java/app/revanced/integrations/shared/Utils.java index 371100d1..a733a83b 100644 --- a/app/src/main/java/app/revanced/integrations/shared/Utils.java +++ b/app/src/main/java/app/revanced/integrations/shared/Utils.java @@ -1,5 +1,12 @@ package app.revanced.integrations.shared; +import java.text.Bidi; +import java.util.Locale; +import java.util.Objects; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.concurrent.*; + import android.annotation.SuppressLint; import android.content.Context; import android.content.Intent; @@ -17,23 +24,9 @@ import android.view.View; import android.view.ViewGroup; import android.view.animation.Animation; import android.view.animation.AnimationUtils; -import android.widget.FrameLayout; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.Toast; -import android.widget.Toolbar; - +import android.widget.*; import androidx.annotation.NonNull; import androidx.annotation.Nullable; - -import java.text.Bidi; -import java.util.*; -import java.util.concurrent.Callable; -import java.util.concurrent.Future; -import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; - import app.revanced.integrations.shared.settings.BooleanSetting; import kotlin.text.Regex; diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java b/app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java index c5283491..a96926cd 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/BaseSettings.java @@ -1,8 +1,8 @@ package app.revanced.integrations.shared.settings; +import static app.revanced.integrations.shared.settings.Setting.parent; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; -import static app.revanced.integrations.shared.settings.Setting.parent; /** * Settings shared across multiple apps. diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/BooleanSetting.java b/app/src/main/java/app/revanced/integrations/shared/settings/BooleanSetting.java index bc20f8c2..e6ca9c13 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/BooleanSetting.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/BooleanSetting.java @@ -1,12 +1,12 @@ package app.revanced.integrations.shared.settings; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import java.util.Objects; import org.json.JSONException; import org.json.JSONObject; -import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; @SuppressWarnings("unused") public class BooleanSetting extends Setting { diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/EnumSetting.java b/app/src/main/java/app/revanced/integrations/shared/settings/EnumSetting.java index 20ef4821..75193b82 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/EnumSetting.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/EnumSetting.java @@ -1,13 +1,14 @@ package app.revanced.integrations.shared.settings; +import java.util.Locale; +import java.util.Objects; + +import org.json.JSONException; +import org.json.JSONObject; + import androidx.annotation.NonNull; import androidx.annotation.Nullable; import app.revanced.integrations.shared.Logger; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.Locale; -import java.util.Objects; /** * If an Enum value is removed or changed, any saved or imported data using the diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/FloatSetting.java b/app/src/main/java/app/revanced/integrations/shared/settings/FloatSetting.java index 6729f67a..20e16964 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/FloatSetting.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/FloatSetting.java @@ -1,12 +1,12 @@ package app.revanced.integrations.shared.settings; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import java.util.Objects; import org.json.JSONException; import org.json.JSONObject; -import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; @SuppressWarnings("unused") public class FloatSetting extends Setting { diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/IntegerSetting.java b/app/src/main/java/app/revanced/integrations/shared/settings/IntegerSetting.java index 414de156..a9cba52d 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/IntegerSetting.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/IntegerSetting.java @@ -1,12 +1,12 @@ package app.revanced.integrations.shared.settings; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import java.util.Objects; import org.json.JSONException; import org.json.JSONObject; -import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; @SuppressWarnings("unused") public class IntegerSetting extends Setting { diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/LongSetting.java b/app/src/main/java/app/revanced/integrations/shared/settings/LongSetting.java index 1c7287a8..bc4c5f58 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/LongSetting.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/LongSetting.java @@ -1,12 +1,12 @@ package app.revanced.integrations.shared.settings; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import java.util.Objects; import org.json.JSONException; import org.json.JSONObject; -import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; @SuppressWarnings("unused") public class LongSetting extends Setting { diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/Setting.java b/app/src/main/java/app/revanced/integrations/shared/settings/Setting.java index f5f7b890..f4f4d77a 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/Setting.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/Setting.java @@ -1,5 +1,13 @@ package app.revanced.integrations.shared.settings; +import static app.revanced.integrations.shared.StringRef.str; + +import java.util.*; + +import org.jetbrains.annotations.NotNull; +import org.json.JSONException; +import org.json.JSONObject; + import android.content.Context; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -8,13 +16,6 @@ import app.revanced.integrations.shared.StringRef; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.shared.settings.preference.SharedPrefCategory; import app.revanced.integrations.youtube.sponsorblock.SponsorBlockSettings; -import org.jetbrains.annotations.NotNull; -import org.json.JSONException; -import org.json.JSONObject; - -import java.util.*; - -import static app.revanced.integrations.shared.StringRef.str; @SuppressWarnings("unused") public abstract class Setting { diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/StringSetting.java b/app/src/main/java/app/revanced/integrations/shared/settings/StringSetting.java index 247cc00c..6e32eb7b 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/StringSetting.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/StringSetting.java @@ -1,12 +1,12 @@ package app.revanced.integrations.shared.settings; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import java.util.Objects; import org.json.JSONException; import org.json.JSONObject; -import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; @SuppressWarnings("unused") public class StringSetting extends Setting { diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/preference/AbstractPreferenceFragment.java b/app/src/main/java/app/revanced/integrations/shared/settings/preference/AbstractPreferenceFragment.java index 34a348a3..3eb58bba 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/preference/AbstractPreferenceFragment.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/preference/AbstractPreferenceFragment.java @@ -1,5 +1,7 @@ package app.revanced.integrations.shared.settings.preference; +import static app.revanced.integrations.shared.StringRef.str; + import android.annotation.SuppressLint; import android.app.AlertDialog; import android.content.Context; @@ -8,14 +10,11 @@ import android.os.Bundle; import android.preference.*; import androidx.annotation.NonNull; import androidx.annotation.Nullable; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.shared.settings.BooleanSetting; import app.revanced.integrations.shared.settings.Setting; -import static app.revanced.integrations.shared.StringRef.str; - /** * * diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/preference/ImportExportPreference.java b/app/src/main/java/app/revanced/integrations/shared/settings/preference/ImportExportPreference.java index 0a9b54c1..b8a2d191 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/preference/ImportExportPreference.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/preference/ImportExportPreference.java @@ -1,5 +1,7 @@ package app.revanced.integrations.shared.settings.preference; +import static app.revanced.integrations.shared.StringRef.str; + import android.app.AlertDialog; import android.content.Context; import android.os.Build; @@ -9,11 +11,9 @@ import android.text.InputType; import android.util.AttributeSet; import android.util.TypedValue; import android.widget.EditText; -import app.revanced.integrations.shared.settings.Setting; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; - -import static app.revanced.integrations.shared.StringRef.str; +import app.revanced.integrations.shared.settings.Setting; /** @noinspection deprecation, unused */ public class ImportExportPreference extends EditTextPreference implements Preference.OnPreferenceClickListener { diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/preference/ResettableEditTextPreference.java b/app/src/main/java/app/revanced/integrations/shared/settings/preference/ResettableEditTextPreference.java index 804b51c4..733d56d0 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/preference/ResettableEditTextPreference.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/preference/ResettableEditTextPreference.java @@ -1,5 +1,9 @@ package app.revanced.integrations.shared.settings.preference; +import static app.revanced.integrations.shared.StringRef.str; + +import java.util.Objects; + import android.app.AlertDialog; import android.content.Context; import android.os.Bundle; @@ -7,12 +11,8 @@ import android.preference.EditTextPreference; import android.util.AttributeSet; import android.widget.Button; import android.widget.EditText; -import app.revanced.integrations.shared.settings.Setting; import app.revanced.integrations.shared.Logger; - -import java.util.Objects; - -import static app.revanced.integrations.shared.StringRef.str; +import app.revanced.integrations.shared.settings.Setting; @SuppressWarnings("unused") public class ResettableEditTextPreference extends EditTextPreference { diff --git a/app/src/main/java/app/revanced/integrations/shared/settings/preference/SharedPrefCategory.java b/app/src/main/java/app/revanced/integrations/shared/settings/preference/SharedPrefCategory.java index 9c7fa45c..115b487e 100644 --- a/app/src/main/java/app/revanced/integrations/shared/settings/preference/SharedPrefCategory.java +++ b/app/src/main/java/app/revanced/integrations/shared/settings/preference/SharedPrefCategory.java @@ -1,5 +1,7 @@ package app.revanced.integrations.shared.settings.preference; +import java.util.Objects; + import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceFragment; @@ -8,8 +10,6 @@ import androidx.annotation.Nullable; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; -import java.util.Objects; - /** * Shared categories, and helper methods. * diff --git a/app/src/main/java/app/revanced/integrations/syncforreddit/FixSLinksPatch.java b/app/src/main/java/app/revanced/integrations/syncforreddit/FixSLinksPatch.java index a3c04ad6..5cd02fbd 100644 --- a/app/src/main/java/app/revanced/integrations/syncforreddit/FixSLinksPatch.java +++ b/app/src/main/java/app/revanced/integrations/syncforreddit/FixSLinksPatch.java @@ -1,11 +1,11 @@ package app.revanced.integrations.syncforreddit; -import android.os.StrictMode; -import app.revanced.integrations.shared.Logger; - import java.net.HttpURLConnection; import java.net.URL; +import android.os.StrictMode; +import app.revanced.integrations.shared.Logger; + public final class FixSLinksPatch { public static String resolveSLink(String link) { if (link.matches(".*reddit\\.com/r/[^/]+/s/[^/]+")) { diff --git a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/AdsFilter.java b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/AdsFilter.java index c246e622..31bbe971 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/AdsFilter.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/AdsFilter.java @@ -1,8 +1,9 @@ package app.revanced.integrations.tiktok.feedfilter; -import app.revanced.integrations.tiktok.settings.Settings; import com.ss.android.ugc.aweme.feed.model.Aweme; +import app.revanced.integrations.tiktok.settings.Settings; + public class AdsFilter implements IFilter { @Override public boolean getEnabled() { diff --git a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/FeedItemsFilter.java b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/FeedItemsFilter.java index d74ea59e..3cf46420 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/FeedItemsFilter.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/FeedItemsFilter.java @@ -1,11 +1,11 @@ package app.revanced.integrations.tiktok.feedfilter; -import com.ss.android.ugc.aweme.feed.model.Aweme; -import com.ss.android.ugc.aweme.feed.model.FeedItemList; - import java.util.Iterator; import java.util.List; +import com.ss.android.ugc.aweme.feed.model.Aweme; +import com.ss.android.ugc.aweme.feed.model.FeedItemList; + public final class FeedItemsFilter { private static final List FILTERS = List.of( new AdsFilter(), diff --git a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ImageVideoFilter.java b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ImageVideoFilter.java index 50472197..2e326a8f 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ImageVideoFilter.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ImageVideoFilter.java @@ -1,8 +1,9 @@ package app.revanced.integrations.tiktok.feedfilter; -import app.revanced.integrations.tiktok.settings.Settings; import com.ss.android.ugc.aweme.feed.model.Aweme; +import app.revanced.integrations.tiktok.settings.Settings; + public class ImageVideoFilter implements IFilter { @Override public boolean getEnabled() { diff --git a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LikeCountFilter.java b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LikeCountFilter.java index 7815283d..b4c9ffb6 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LikeCountFilter.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LikeCountFilter.java @@ -1,10 +1,11 @@ package app.revanced.integrations.tiktok.feedfilter; -import app.revanced.integrations.tiktok.settings.Settings; +import static app.revanced.integrations.tiktok.Utils.parseMinMax; + import com.ss.android.ugc.aweme.feed.model.Aweme; import com.ss.android.ugc.aweme.feed.model.AwemeStatistics; -import static app.revanced.integrations.tiktok.Utils.parseMinMax; +import app.revanced.integrations.tiktok.settings.Settings; public final class LikeCountFilter implements IFilter { final long minLike; diff --git a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LiveFilter.java b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LiveFilter.java index bec7f11c..89fdc4a0 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LiveFilter.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/LiveFilter.java @@ -1,8 +1,9 @@ package app.revanced.integrations.tiktok.feedfilter; -import app.revanced.integrations.tiktok.settings.Settings; import com.ss.android.ugc.aweme.feed.model.Aweme; +import app.revanced.integrations.tiktok.settings.Settings; + public class LiveFilter implements IFilter { @Override public boolean getEnabled() { diff --git a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/StoryFilter.java b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/StoryFilter.java index 2c209d0d..2e56c3af 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/StoryFilter.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/StoryFilter.java @@ -1,8 +1,9 @@ package app.revanced.integrations.tiktok.feedfilter; -import app.revanced.integrations.tiktok.settings.Settings; import com.ss.android.ugc.aweme.feed.model.Aweme; +import app.revanced.integrations.tiktok.settings.Settings; + public class StoryFilter implements IFilter { @Override public boolean getEnabled() { diff --git a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ViewCountFilter.java b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ViewCountFilter.java index 637401af..f565980d 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ViewCountFilter.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/feedfilter/ViewCountFilter.java @@ -1,10 +1,11 @@ package app.revanced.integrations.tiktok.feedfilter; -import app.revanced.integrations.tiktok.settings.Settings; +import static app.revanced.integrations.tiktok.Utils.parseMinMax; + import com.ss.android.ugc.aweme.feed.model.Aweme; import com.ss.android.ugc.aweme.feed.model.AwemeStatistics; -import static app.revanced.integrations.tiktok.Utils.parseMinMax; +import app.revanced.integrations.tiktok.settings.Settings; public class ViewCountFilter implements IFilter { final long minView; diff --git a/app/src/main/java/app/revanced/integrations/tiktok/settings/AdPersonalizationActivityHook.java b/app/src/main/java/app/revanced/integrations/tiktok/settings/AdPersonalizationActivityHook.java index 2e4812e4..38c7066b 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/settings/AdPersonalizationActivityHook.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/settings/AdPersonalizationActivityHook.java @@ -1,5 +1,10 @@ package app.revanced.integrations.tiktok.settings; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; + +import com.bytedance.ies.ugc.aweme.commercialize.compliance.personalization.AdPersonalizationActivity; + import android.content.Context; import android.content.Intent; import android.os.Bundle; @@ -10,10 +15,6 @@ import android.widget.LinearLayout; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.tiktok.settings.preference.ReVancedPreferenceFragment; -import com.bytedance.ies.ugc.aweme.commercialize.compliance.personalization.AdPersonalizationActivity; - -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; /** * Hooks AdPersonalizationActivity. diff --git a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/DownloadPathPreference.java b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/DownloadPathPreference.java index 8bf8a40f..f6d2c5a5 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/DownloadPathPreference.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/DownloadPathPreference.java @@ -14,7 +14,6 @@ import android.widget.EditText; import android.widget.LinearLayout; import android.widget.RadioButton; import android.widget.RadioGroup; - import app.revanced.integrations.shared.settings.StringSetting; @SuppressWarnings("deprecation") diff --git a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/InputTextPreference.java b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/InputTextPreference.java index 7a103391..aeb78c81 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/InputTextPreference.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/InputTextPreference.java @@ -2,7 +2,6 @@ package app.revanced.integrations.tiktok.settings.preference; import android.content.Context; import android.preference.EditTextPreference; - import app.revanced.integrations.shared.settings.StringSetting; public class InputTextPreference extends EditTextPreference { diff --git a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/RangeValuePreference.java b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/RangeValuePreference.java index 1c83b18c..72ba88ce 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/RangeValuePreference.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/RangeValuePreference.java @@ -12,7 +12,6 @@ import android.view.View; import android.widget.EditText; import android.widget.LinearLayout; import android.widget.TextView; - import app.revanced.integrations.shared.settings.StringSetting; @SuppressWarnings("deprecation") diff --git a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/ReVancedPreferenceFragment.java b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/ReVancedPreferenceFragment.java index 66359350..9ee1246b 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/ReVancedPreferenceFragment.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/ReVancedPreferenceFragment.java @@ -1,5 +1,7 @@ package app.revanced.integrations.tiktok.settings.preference; +import org.jetbrains.annotations.NotNull; + import android.preference.Preference; import android.preference.PreferenceScreen; import androidx.annotation.NonNull; @@ -9,7 +11,6 @@ import app.revanced.integrations.tiktok.settings.preference.categories.Downloads import app.revanced.integrations.tiktok.settings.preference.categories.FeedFilterPreferenceCategory; import app.revanced.integrations.tiktok.settings.preference.categories.IntegrationsPreferenceCategory; import app.revanced.integrations.tiktok.settings.preference.categories.SimSpoofPreferenceCategory; -import org.jetbrains.annotations.NotNull; /** * Preference fragment for ReVanced settings diff --git a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/TogglePreference.java b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/TogglePreference.java index 0af4a44f..f1959072 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/TogglePreference.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/TogglePreference.java @@ -2,7 +2,6 @@ package app.revanced.integrations.tiktok.settings.preference; import android.content.Context; import android.preference.SwitchPreference; - import app.revanced.integrations.shared.settings.BooleanSetting; @SuppressWarnings("deprecation") diff --git a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java index 5bb40a2e..b6cb5de7 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/FeedFilterPreferenceCategory.java @@ -2,9 +2,9 @@ package app.revanced.integrations.tiktok.settings.preference.categories; import android.content.Context; import android.preference.PreferenceScreen; -import app.revanced.integrations.tiktok.settings.preference.RangeValuePreference; import app.revanced.integrations.tiktok.settings.Settings; import app.revanced.integrations.tiktok.settings.SettingsStatus; +import app.revanced.integrations.tiktok.settings.preference.RangeValuePreference; import app.revanced.integrations.tiktok.settings.preference.TogglePreference; @SuppressWarnings("deprecation") diff --git a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/IntegrationsPreferenceCategory.java b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/IntegrationsPreferenceCategory.java index 96e6e892..fde91bc1 100644 --- a/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/IntegrationsPreferenceCategory.java +++ b/app/src/main/java/app/revanced/integrations/tiktok/settings/preference/categories/IntegrationsPreferenceCategory.java @@ -2,7 +2,6 @@ package app.revanced.integrations.tiktok.settings.preference.categories; import android.content.Context; import android.preference.PreferenceScreen; - import app.revanced.integrations.shared.settings.BaseSettings; import app.revanced.integrations.tiktok.settings.preference.TogglePreference; diff --git a/app/src/main/java/app/revanced/integrations/tudortmund/lockscreen/ShowOnLockscreenPatch.java b/app/src/main/java/app/revanced/integrations/tudortmund/lockscreen/ShowOnLockscreenPatch.java index 0d05c9d9..4e61b753 100644 --- a/app/src/main/java/app/revanced/integrations/tudortmund/lockscreen/ShowOnLockscreenPatch.java +++ b/app/src/main/java/app/revanced/integrations/tudortmund/lockscreen/ShowOnLockscreenPatch.java @@ -1,5 +1,8 @@ package app.revanced.integrations.tudortmund.lockscreen; +import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD; +import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; + import android.content.Context; import android.hardware.display.DisplayManager; import android.os.Build; @@ -7,9 +10,6 @@ import android.view.Display; import android.view.Window; import androidx.appcompat.app.AppCompatActivity; -import static android.view.WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD; -import static android.view.WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED; - public class ShowOnLockscreenPatch { /** * @noinspection deprecation diff --git a/app/src/main/java/app/revanced/integrations/tumblr/patches/TimelineFilterPatch.java b/app/src/main/java/app/revanced/integrations/tumblr/patches/TimelineFilterPatch.java index 1c1da707..a3e65031 100644 --- a/app/src/main/java/app/revanced/integrations/tumblr/patches/TimelineFilterPatch.java +++ b/app/src/main/java/app/revanced/integrations/tumblr/patches/TimelineFilterPatch.java @@ -1,11 +1,11 @@ package app.revanced.integrations.tumblr.patches; -import com.tumblr.rumblr.model.TimelineObject; -import com.tumblr.rumblr.model.Timelineable; - import java.util.HashSet; import java.util.List; +import com.tumblr.rumblr.model.TimelineObject; +import com.tumblr.rumblr.model.Timelineable; + public final class TimelineFilterPatch { private static final HashSet blockedObjectTypes = new HashSet<>(); diff --git a/app/src/main/java/app/revanced/integrations/twitch/adblock/LuminousService.java b/app/src/main/java/app/revanced/integrations/twitch/adblock/LuminousService.java index 72f19ca0..1b02407e 100644 --- a/app/src/main/java/app/revanced/integrations/twitch/adblock/LuminousService.java +++ b/app/src/main/java/app/revanced/integrations/twitch/adblock/LuminousService.java @@ -1,11 +1,11 @@ package app.revanced.integrations.twitch.adblock; +import static app.revanced.integrations.shared.StringRef.str; + import app.revanced.integrations.shared.Logger; import okhttp3.HttpUrl; import okhttp3.Request; -import static app.revanced.integrations.shared.StringRef.str; - public class LuminousService implements IAdblockService { @Override public String friendlyName() { diff --git a/app/src/main/java/app/revanced/integrations/twitch/adblock/PurpleAdblockService.java b/app/src/main/java/app/revanced/integrations/twitch/adblock/PurpleAdblockService.java index c40b06e5..3e7072f2 100644 --- a/app/src/main/java/app/revanced/integrations/twitch/adblock/PurpleAdblockService.java +++ b/app/src/main/java/app/revanced/integrations/twitch/adblock/PurpleAdblockService.java @@ -1,15 +1,15 @@ package app.revanced.integrations.twitch.adblock; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.twitch.api.RetrofitClient; -import okhttp3.HttpUrl; -import okhttp3.Request; +import static app.revanced.integrations.shared.StringRef.str; import java.io.IOException; import java.util.HashMap; import java.util.Map; -import static app.revanced.integrations.shared.StringRef.str; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.twitch.api.RetrofitClient; +import okhttp3.HttpUrl; +import okhttp3.Request; public class PurpleAdblockService implements IAdblockService { private final Map tunnels = new HashMap<>() {{ diff --git a/app/src/main/java/app/revanced/integrations/twitch/api/RequestInterceptor.java b/app/src/main/java/app/revanced/integrations/twitch/api/RequestInterceptor.java index 236e72c1..a1c68a20 100644 --- a/app/src/main/java/app/revanced/integrations/twitch/api/RequestInterceptor.java +++ b/app/src/main/java/app/revanced/integrations/twitch/api/RequestInterceptor.java @@ -1,5 +1,9 @@ package app.revanced.integrations.twitch.api; +import static app.revanced.integrations.shared.StringRef.str; + +import java.io.IOException; + import androidx.annotation.NonNull; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; @@ -10,10 +14,6 @@ import app.revanced.integrations.twitch.settings.Settings; import okhttp3.Interceptor; import okhttp3.Response; -import java.io.IOException; - -import static app.revanced.integrations.shared.StringRef.str; - public class RequestInterceptor implements Interceptor { private IAdblockService activeService = null; diff --git a/app/src/main/java/app/revanced/integrations/twitch/patches/ShowDeletedMessagesPatch.java b/app/src/main/java/app/revanced/integrations/twitch/patches/ShowDeletedMessagesPatch.java index bdf06ed7..d5e5f8fb 100644 --- a/app/src/main/java/app/revanced/integrations/twitch/patches/ShowDeletedMessagesPatch.java +++ b/app/src/main/java/app/revanced/integrations/twitch/patches/ShowDeletedMessagesPatch.java @@ -10,9 +10,7 @@ import android.text.SpannedString; import android.text.style.ForegroundColorSpan; import android.text.style.StrikethroughSpan; import android.text.style.StyleSpan; - import androidx.annotation.Nullable; - import app.revanced.integrations.twitch.settings.Settings; import tv.twitch.android.shared.chat.util.ClickableUsernameSpan; diff --git a/app/src/main/java/app/revanced/integrations/twitch/settings/AppCompatActivityHook.java b/app/src/main/java/app/revanced/integrations/twitch/settings/AppCompatActivityHook.java index 42da7798..97015ee3 100644 --- a/app/src/main/java/app/revanced/integrations/twitch/settings/AppCompatActivityHook.java +++ b/app/src/main/java/app/revanced/integrations/twitch/settings/AppCompatActivityHook.java @@ -1,5 +1,8 @@ package app.revanced.integrations.twitch.settings; +import java.util.ArrayList; +import java.util.List; + import android.content.Intent; import android.os.Bundle; import androidx.appcompat.app.ActionBar; @@ -9,9 +12,6 @@ import app.revanced.integrations.twitch.settings.preference.ReVancedPreferenceFr import tv.twitch.android.feature.settings.menu.SettingsMenuGroup; import tv.twitch.android.settings.SettingsActivity; -import java.util.ArrayList; -import java.util.List; - /** * Hooks AppCompatActivity. *

diff --git a/app/src/main/java/app/revanced/integrations/twitch/settings/Settings.java b/app/src/main/java/app/revanced/integrations/twitch/settings/Settings.java index 8f3969b7..3923d2ed 100644 --- a/app/src/main/java/app/revanced/integrations/twitch/settings/Settings.java +++ b/app/src/main/java/app/revanced/integrations/twitch/settings/Settings.java @@ -1,12 +1,12 @@ package app.revanced.integrations.twitch.settings; -import app.revanced.integrations.shared.settings.BooleanSetting; -import app.revanced.integrations.shared.settings.BaseSettings; -import app.revanced.integrations.shared.settings.StringSetting; - import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; +import app.revanced.integrations.shared.settings.BaseSettings; +import app.revanced.integrations.shared.settings.BooleanSetting; +import app.revanced.integrations.shared.settings.StringSetting; + public class Settings extends BaseSettings { /* Ads */ public static final BooleanSetting BLOCK_VIDEO_ADS = new BooleanSetting("revanced_block_video_ads", TRUE); diff --git a/app/src/main/java/app/revanced/integrations/twitter/patches/hook/json/JsonHookPatch.kt b/app/src/main/java/app/revanced/integrations/twitter/patches/hook/json/JsonHookPatch.kt index 1eb96cfe..cd8a719c 100644 --- a/app/src/main/java/app/revanced/integrations/twitter/patches/hook/json/JsonHookPatch.kt +++ b/app/src/main/java/app/revanced/integrations/twitter/patches/hook/json/JsonHookPatch.kt @@ -3,9 +3,9 @@ package app.revanced.integrations.twitter.patches.hook.json import app.revanced.integrations.twitter.patches.hook.patch.dummy.DummyHook import app.revanced.integrations.twitter.utils.json.JsonUtils.parseJson import app.revanced.integrations.twitter.utils.stream.StreamUtils -import org.json.JSONException import java.io.IOException import java.io.InputStream +import org.json.JSONException object JsonHookPatch { // Additional hooks added by corresponding patch. diff --git a/app/src/main/java/app/revanced/integrations/twitter/utils/json/JsonUtils.kt b/app/src/main/java/app/revanced/integrations/twitter/utils/json/JsonUtils.kt index 80675c80..bfab8b16 100644 --- a/app/src/main/java/app/revanced/integrations/twitter/utils/json/JsonUtils.kt +++ b/app/src/main/java/app/revanced/integrations/twitter/utils/json/JsonUtils.kt @@ -1,10 +1,10 @@ package app.revanced.integrations.twitter.utils.json import app.revanced.integrations.twitter.utils.stream.StreamUtils -import org.json.JSONException -import org.json.JSONObject import java.io.IOException import java.io.InputStream +import org.json.JSONException +import org.json.JSONObject object JsonUtils { @JvmStatic diff --git a/app/src/main/java/app/revanced/integrations/youtube/ByteTrieSearch.java b/app/src/main/java/app/revanced/integrations/youtube/ByteTrieSearch.java index aa2b94b8..de5d3ff3 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/ByteTrieSearch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/ByteTrieSearch.java @@ -1,9 +1,9 @@ package app.revanced.integrations.youtube; -import androidx.annotation.NonNull; - import java.nio.charset.StandardCharsets; +import androidx.annotation.NonNull; + public final class ByteTrieSearch extends TrieSearch { private static final class ByteTrieNode extends TrieNode { diff --git a/app/src/main/java/app/revanced/integrations/youtube/TrieSearch.java b/app/src/main/java/app/revanced/integrations/youtube/TrieSearch.java index 1c927cd2..2fd8c0fa 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/TrieSearch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/TrieSearch.java @@ -1,13 +1,13 @@ package app.revanced.integrations.youtube; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + /** * Searches for a group of different patterns using a trie (prefix tree). * Can significantly speed up searching for multiple patterns. diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/AlternativeThumbnailsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/AlternativeThumbnailsPatch.java index 1e0d2e1e..0d052be7 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/AlternativeThumbnailsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/AlternativeThumbnailsPatch.java @@ -1,22 +1,8 @@ package app.revanced.integrations.youtube.patches; -import android.net.Uri; -import androidx.annotation.GuardedBy; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import app.revanced.integrations.shared.settings.BaseSettings; -import app.revanced.integrations.shared.settings.EnumSetting; -import app.revanced.integrations.shared.settings.Setting; -import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; -import app.revanced.integrations.youtube.shared.NavigationBar; -import app.revanced.integrations.youtube.shared.PlayerType; - -import org.chromium.net.UrlRequest; -import org.chromium.net.UrlResponseInfo; -import org.chromium.net.impl.CronetUrlRequest; +import static app.revanced.integrations.shared.StringRef.str; +import static app.revanced.integrations.youtube.settings.Settings.*; +import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton; import java.io.IOException; import java.net.HttpURLConnection; @@ -26,13 +12,22 @@ import java.util.LinkedHashMap; import java.util.Map; import java.util.concurrent.ExecutionException; -import static app.revanced.integrations.shared.StringRef.str; -import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_HOME; -import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_LIBRARY; -import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_PLAYER; -import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_SEARCH; -import static app.revanced.integrations.youtube.settings.Settings.ALT_THUMBNAIL_SUBSCRIPTIONS; -import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton; +import org.chromium.net.UrlRequest; +import org.chromium.net.UrlResponseInfo; +import org.chromium.net.impl.CronetUrlRequest; + +import android.net.Uri; +import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.shared.settings.BaseSettings; +import app.revanced.integrations.shared.settings.EnumSetting; +import app.revanced.integrations.shared.settings.Setting; +import app.revanced.integrations.youtube.settings.Settings; +import app.revanced.integrations.youtube.shared.NavigationBar; +import app.revanced.integrations.youtube.shared.PlayerType; /** * Alternative YouTube thumbnails. diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/BypassURLRedirectsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/BypassURLRedirectsPatch.java index c49f8bbd..26fe1684 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/BypassURLRedirectsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/BypassURLRedirectsPatch.java @@ -1,9 +1,8 @@ package app.revanced.integrations.youtube.patches; import android.net.Uri; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public class BypassURLRedirectsPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/CopyVideoUrlPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/CopyVideoUrlPatch.java index fec49a34..87e8206d 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/CopyVideoUrlPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/CopyVideoUrlPatch.java @@ -3,7 +3,6 @@ package app.revanced.integrations.youtube.patches; import static app.revanced.integrations.shared.StringRef.str; import android.os.Build; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/CustomPlayerOverlayOpacityPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/CustomPlayerOverlayOpacityPatch.java index 26bedbb0..27bfab2a 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/CustomPlayerOverlayOpacityPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/CustomPlayerOverlayOpacityPatch.java @@ -1,9 +1,8 @@ package app.revanced.integrations.youtube.patches; import android.widget.ImageView; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public class CustomPlayerOverlayOpacityPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch.java index 5e3eca57..27966506 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/DisablePreciseSeekingGesturePatch.java @@ -2,7 +2,6 @@ package app.revanced.integrations.youtube.patches; import android.view.MotionEvent; import android.view.VelocityTracker; - import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/DisableSuggestedVideoEndScreenPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/DisableSuggestedVideoEndScreenPatch.java index 0b7897ba..725789ca 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/DisableSuggestedVideoEndScreenPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/DisableSuggestedVideoEndScreenPatch.java @@ -1,13 +1,7 @@ package app.revanced.integrations.youtube.patches; import android.annotation.SuppressLint; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewTreeObserver; import android.widget.ImageView; - -import androidx.annotation.NonNull; -import app.revanced.integrations.shared.Logger; import app.revanced.integrations.youtube.settings.Settings; /** @noinspection unused*/ diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/DownloadsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/DownloadsPatch.java index a9c37d00..b87c00df 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/DownloadsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/DownloadsPatch.java @@ -1,15 +1,13 @@ package app.revanced.integrations.youtube.patches; +import java.lang.ref.WeakReference; +import java.util.Objects; + import android.app.Activity; import android.content.Context; import android.content.Intent; import android.content.pm.PackageManager; - import androidx.annotation.NonNull; - -import java.lang.ref.WeakReference; -import java.util.Objects; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.StringRef; import app.revanced.integrations.shared.Utils; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/FixBackToExitGesturePatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/FixBackToExitGesturePatch.java index d3408a62..a0c73cc0 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/FixBackToExitGesturePatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/FixBackToExitGesturePatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches; import android.app.Activity; - import app.revanced.integrations.shared.Logger; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/FullscreenPanelsRemoverPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/FullscreenPanelsRemoverPatch.java index 6dd8e667..e71e95e2 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/FullscreenPanelsRemoverPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/FullscreenPanelsRemoverPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch.java index 3c644308..09fd6a44 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HDRAutoBrightnessPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches; import android.view.WindowManager; - import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.swipecontrols.SwipeControlsHostActivity; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideAlbumCardsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideAlbumCardsPatch.java index e0d85194..67a53cd8 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideAlbumCardsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideAlbumCardsPatch.java @@ -1,9 +1,8 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public class HideAlbumCardsPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideBreakingNewsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideBreakingNewsPatch.java index bd6d89fa..0286b0a8 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideBreakingNewsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideBreakingNewsPatch.java @@ -1,10 +1,9 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - +import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.patches.spoof.SpoofAppVersionPatch; import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Utils; @SuppressWarnings("unused") public class HideBreakingNewsPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideCaptionsButtonPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideCaptionsButtonPatch.java index d6487b44..8d9b5643 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideCaptionsButtonPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideCaptionsButtonPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches; import android.widget.ImageView; - import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideCastButtonPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideCastButtonPatch.java index aec2fbfc..e09466c5 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideCastButtonPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideCastButtonPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideCrowdfundingBoxPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideCrowdfundingBoxPatch.java index 6546da78..5ed49845 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideCrowdfundingBoxPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideCrowdfundingBoxPatch.java @@ -1,9 +1,8 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public class HideCrowdfundingBoxPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideEndscreenCardsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideEndscreenCardsPatch.java index 36e4727c..3eb50b70 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideEndscreenCardsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideEndscreenCardsPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideFilterBarPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideFilterBarPatch.java index dd15c952..a775bcf9 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideFilterBarPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideFilterBarPatch.java @@ -1,9 +1,8 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public final class HideFilterBarPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideInfoCardsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideInfoCardsPatch.java index 764326dc..e1036298 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideInfoCardsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideInfoCardsPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/HideLoadMoreButtonPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/HideLoadMoreButtonPatch.java index fa3a0e70..39b3ad3c 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/HideLoadMoreButtonPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/HideLoadMoreButtonPatch.java @@ -1,9 +1,8 @@ package app.revanced.integrations.youtube.patches; import android.view.View; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public class HideLoadMoreButtonPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/NavigationButtonsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/NavigationButtonsPatch.java index e7406abe..beeba7e9 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/NavigationButtonsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/NavigationButtonsPatch.java @@ -2,12 +2,10 @@ package app.revanced.integrations.youtube.patches; import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton; -import android.view.View; - import java.util.EnumMap; import java.util.Map; -import app.revanced.integrations.shared.Logger; +import android.view.View; import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/PlayerOverlaysHookPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/PlayerOverlaysHookPatch.java index 32732cdc..cfcdc522 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/PlayerOverlaysHookPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/PlayerOverlaysHookPatch.java @@ -1,9 +1,6 @@ package app.revanced.integrations.youtube.patches; import android.view.ViewGroup; - -import androidx.annotation.Nullable; - import app.revanced.integrations.youtube.shared.PlayerOverlays; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/PlayerTypeHookPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/PlayerTypeHookPatch.java index a669ca94..09506e67 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/PlayerTypeHookPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/PlayerTypeHookPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches; import androidx.annotation.Nullable; - import app.revanced.integrations.youtube.shared.PlayerType; import app.revanced.integrations.youtube.shared.VideoState; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/ReturnYouTubeDislikePatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/ReturnYouTubeDislikePatch.java index 4938fb37..73604287 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/ReturnYouTubeDislikePatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/ReturnYouTubeDislikePatch.java @@ -1,5 +1,12 @@ package app.revanced.integrations.youtube.patches; +import static app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike.Vote; + +import java.lang.ref.WeakReference; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; + import android.graphics.Rect; import android.graphics.drawable.ShapeDrawable; import android.os.Build; @@ -8,22 +15,14 @@ import android.view.View; import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; - +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.patches.components.ReturnYouTubeDislikeFilterPatch; import app.revanced.integrations.youtube.patches.spoof.SpoofAppVersionPatch; import app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike; import app.revanced.integrations.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi; import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.shared.PlayerType; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; - -import java.lang.ref.WeakReference; -import java.util.ArrayList; -import java.util.List; -import java.util.Objects; - -import static app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike.Vote; /** * Handles all interaction of UI patch components. diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/VideoInformation.java b/app/src/main/java/app/revanced/integrations/youtube/patches/VideoInformation.java index 57751ff0..795e9b4a 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/VideoInformation.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/VideoInformation.java @@ -1,15 +1,15 @@ package app.revanced.integrations.youtube.patches; -import androidx.annotation.NonNull; -import app.revanced.integrations.youtube.patches.playback.speed.RememberPlaybackSpeedPatch; -import app.revanced.integrations.youtube.shared.VideoState; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; - import java.lang.ref.WeakReference; import java.lang.reflect.Method; import java.util.Objects; +import androidx.annotation.NonNull; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.patches.playback.speed.RememberPlaybackSpeedPatch; +import app.revanced.integrations.youtube.shared.VideoState; + /** * Hooking class for the current playing video. * @noinspection unused diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java index db1e3755..08444891 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/AnnouncementsPatch.java @@ -1,18 +1,8 @@ package app.revanced.integrations.youtube.patches.announcements; -import android.app.Activity; -import android.os.Build; -import android.text.Html; -import android.text.method.LinkMovementMethod; -import android.widget.TextView; -import androidx.annotation.RequiresApi; - -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; -import app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes; -import app.revanced.integrations.youtube.requests.Requester; -import app.revanced.integrations.youtube.settings.Settings; -import org.json.JSONObject; +import static android.text.Html.FROM_HTML_MODE_COMPACT; +import static app.revanced.integrations.shared.StringRef.str; +import static app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT; import java.io.IOException; import java.net.HttpURLConnection; @@ -20,9 +10,19 @@ import java.nio.charset.StandardCharsets; import java.security.MessageDigest; import java.util.Locale; -import static android.text.Html.FROM_HTML_MODE_COMPACT; -import static app.revanced.integrations.shared.StringRef.str; -import static app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes.GET_LATEST_ANNOUNCEMENT; +import org.json.JSONObject; + +import android.app.Activity; +import android.os.Build; +import android.text.Html; +import android.text.method.LinkMovementMethod; +import android.widget.TextView; +import androidx.annotation.RequiresApi; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.patches.announcements.requests.AnnouncementsRoutes; +import app.revanced.integrations.youtube.requests.Requester; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public final class AnnouncementsPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/requests/AnnouncementsRoutes.java b/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/requests/AnnouncementsRoutes.java index 59273c2b..614df54f 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/requests/AnnouncementsRoutes.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/announcements/requests/AnnouncementsRoutes.java @@ -1,12 +1,12 @@ package app.revanced.integrations.youtube.patches.announcements.requests; -import app.revanced.integrations.youtube.requests.Requester; -import app.revanced.integrations.youtube.requests.Route; +import static app.revanced.integrations.youtube.requests.Route.Method.GET; import java.io.IOException; import java.net.HttpURLConnection; -import static app.revanced.integrations.youtube.requests.Route.Method.GET; +import app.revanced.integrations.youtube.requests.Requester; +import app.revanced.integrations.youtube.requests.Route; public class AnnouncementsRoutes { private static final String ANNOUNCEMENTS_PROVIDER = "https://api.revanced.app/v2"; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/AdsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/AdsFilter.java index 22daf6dd..2da51ba7 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/AdsFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/AdsFilter.java @@ -5,13 +5,11 @@ import static app.revanced.integrations.shared.StringRef.str; import android.app.Instrumentation; import android.view.KeyEvent; import android.view.View; - import androidx.annotation.Nullable; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.StringTrieSearch; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public final class AdsFilter extends Filter { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/ButtonsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/ButtonsFilter.java index a78f9b5a..87e26578 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/ButtonsFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/ButtonsFilter.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches.components; import androidx.annotation.Nullable; - import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/CustomFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/CustomFilter.java index 51d86b54..4087bd71 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/CustomFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/CustomFilter.java @@ -2,17 +2,12 @@ package app.revanced.integrations.youtube.patches.components; import static app.revanced.integrations.shared.StringRef.str; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; +import java.util.*; import java.util.regex.Matcher; import java.util.regex.Pattern; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.ByteTrieSearch; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/DescriptionComponentsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/DescriptionComponentsFilter.java index 0bf50b15..534a27fd 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/DescriptionComponentsFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/DescriptionComponentsFilter.java @@ -1,8 +1,8 @@ package app.revanced.integrations.youtube.patches.components; import androidx.annotation.Nullable; -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.StringTrieSearch; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") final class DescriptionComponentsFilter extends Filter { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java index 7858bb74..437e4f45 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/KeywordContentFilter.java @@ -4,16 +4,14 @@ import static app.revanced.integrations.shared.StringRef.str; import static app.revanced.integrations.youtube.ByteTrieSearch.convertStringsToBytes; import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton; -import android.os.Build; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import androidx.annotation.RequiresApi; - import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; +import android.os.Build; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.ByteTrieSearch; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java index f32ad545..394ba5a7 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/LayoutComponentsFilter.java @@ -1,13 +1,11 @@ package app.revanced.integrations.youtube.patches.components; import android.os.Build; - import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.youtube.StringTrieSearch; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public final class LayoutComponentsFilter extends Filter { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java index e1bb9d67..e96ebcfa 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/LithoFilterPatch.java @@ -1,21 +1,16 @@ package app.revanced.integrations.youtube.patches.components; +import java.nio.ByteBuffer; +import java.util.*; +import java.util.function.Consumer; + import android.os.Build; import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; - -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Spliterator; -import java.util.function.Consumer; - import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.settings.BooleanSetting; import app.revanced.integrations.shared.settings.BaseSettings; +import app.revanced.integrations.shared.settings.BooleanSetting; import app.revanced.integrations.youtube.ByteTrieSearch; import app.revanced.integrations.youtube.StringTrieSearch; import app.revanced.integrations.youtube.TrieSearch; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java index 03319588..d15948a5 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlaybackSpeedMenuFilterPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches.components; import androidx.annotation.Nullable; - import app.revanced.integrations.youtube.patches.playback.speed.CustomPlaybackSpeedPatch; /** diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java index 19ccfac5..27dfe7d3 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/PlayerFlyoutMenuItemsFilter.java @@ -1,10 +1,8 @@ package app.revanced.integrations.youtube.patches.components; import android.os.Build; - import androidx.annotation.Nullable; import androidx.annotation.RequiresApi; - import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.shared.PlayerType; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java index 927e4493..566c2b65 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/ReturnYouTubeDislikeFilterPatch.java @@ -1,18 +1,17 @@ package app.revanced.integrations.youtube.patches.components; -import androidx.annotation.GuardedBy; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import java.util.LinkedHashMap; import java.util.LinkedHashSet; import java.util.Map; +import androidx.annotation.GuardedBy; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.youtube.TrieSearch; import app.revanced.integrations.youtube.patches.ReturnYouTubeDislikePatch; import app.revanced.integrations.youtube.patches.VideoInformation; import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.youtube.TrieSearch; /** * Searches for video id's in the proto buffer of Shorts dislike. diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java index 8c3dbf26..80d62631 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java @@ -2,12 +2,10 @@ package app.revanced.integrations.youtube.patches.components; import static app.revanced.integrations.shared.Utils.hideViewUnderCondition; -import android.view.View; - -import androidx.annotation.Nullable; - import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar; +import android.view.View; +import androidx.annotation.Nullable; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.shared.NavigationBar; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/components/VideoQualityMenuFilterPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/components/VideoQualityMenuFilterPatch.java index e3d20e2d..25cd0419 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/components/VideoQualityMenuFilterPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/components/VideoQualityMenuFilterPatch.java @@ -1,7 +1,6 @@ package app.revanced.integrations.youtube.patches.components; import androidx.annotation.Nullable; - import app.revanced.integrations.youtube.patches.playback.quality.RestoreOldVideoQualityMenuPatch; import app.revanced.integrations.youtube.settings.Settings; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RememberVideoQualityPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RememberVideoQualityPatch.java index 56679285..eb276dec 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RememberVideoQualityPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RememberVideoQualityPatch.java @@ -1,19 +1,18 @@ package app.revanced.integrations.youtube.patches.playback.quality; -import androidx.annotation.Nullable; - -import app.revanced.integrations.shared.settings.IntegerSetting; -import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; +import static app.revanced.integrations.shared.StringRef.str; +import static app.revanced.integrations.shared.Utils.NetworkType; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.ArrayList; import java.util.List; -import static app.revanced.integrations.shared.StringRef.str; -import static app.revanced.integrations.shared.Utils.NetworkType; +import androidx.annotation.Nullable; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.shared.settings.IntegerSetting; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public class RememberVideoQualityPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java index d0a91423..e96de727 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/quality/RestoreOldVideoQualityMenuPatch.java @@ -4,10 +4,9 @@ import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import android.widget.ListView; - +import app.revanced.integrations.shared.Logger; import app.revanced.integrations.youtube.patches.components.VideoQualityMenuFilterPatch; import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Logger; /** * This patch contains the logic to show the old video quality menu. diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java index e863f8fd..ce0ac659 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/CustomPlaybackSpeedPatch.java @@ -2,18 +2,17 @@ package app.revanced.integrations.youtube.patches.playback.speed; import static app.revanced.integrations.shared.StringRef.str; +import java.util.Arrays; + import android.preference.ListPreference; import android.support.v7.widget.RecyclerView; import android.view.View; import android.view.ViewGroup; import androidx.annotation.NonNull; - -import app.revanced.integrations.youtube.patches.components.PlaybackSpeedMenuFilterPatch; -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; - -import java.util.Arrays; +import app.revanced.integrations.youtube.patches.components.PlaybackSpeedMenuFilterPatch; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public class CustomPlaybackSpeedPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java index 1782ade6..df9e070f 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/playback/speed/RememberPlaybackSpeedPatch.java @@ -2,10 +2,10 @@ package app.revanced.integrations.youtube.patches.playback.speed; import static app.revanced.integrations.shared.StringRef.str; -import app.revanced.integrations.youtube.patches.VideoInformation; -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.patches.VideoInformation; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public final class RememberPlaybackSpeedPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java index 6573467a..5459634b 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/SpoofSignaturePatch.java @@ -1,5 +1,13 @@ package app.revanced.integrations.youtube.patches.spoof; +import static app.revanced.integrations.shared.Utils.containsAny; +import static app.revanced.integrations.youtube.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer; + +import java.util.concurrent.ExecutionException; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; + import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -10,14 +18,6 @@ import app.revanced.integrations.youtube.patches.VideoInformation; import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.shared.PlayerType; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - -import static app.revanced.integrations.shared.Utils.containsAny; -import static app.revanced.integrations.youtube.patches.spoof.requests.StoryboardRendererRequester.getStoryboardRenderer; - /** @noinspection unused*/ @Deprecated public class SpoofSignaturePatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java index 8e337297..b8210429 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/StoryboardRenderer.java @@ -1,9 +1,9 @@ package app.revanced.integrations.youtube.patches.spoof; -import androidx.annotation.Nullable; - import org.jetbrains.annotations.NotNull; +import androidx.annotation.Nullable; + @Deprecated public final class StoryboardRenderer { @Nullable diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java index 67e69502..69e129de 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/PlayerRoutes.java @@ -1,15 +1,16 @@ package app.revanced.integrations.youtube.patches.spoof.requests; -import app.revanced.integrations.youtube.requests.Requester; -import app.revanced.integrations.youtube.requests.Route; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; -import org.json.JSONException; -import org.json.JSONObject; - import java.io.IOException; import java.net.HttpURLConnection; +import org.json.JSONException; +import org.json.JSONObject; + +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.requests.Requester; +import app.revanced.integrations.youtube.requests.Route; + @Deprecated final class PlayerRoutes { private static final String YT_API_URL = "https://www.youtube.com/youtubei/v1/"; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java index 31d8c3ef..61440d89 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/spoof/requests/StoryboardRendererRequester.java @@ -1,14 +1,7 @@ package app.revanced.integrations.youtube.patches.spoof.requests; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import app.revanced.integrations.shared.settings.BaseSettings; -import app.revanced.integrations.youtube.patches.spoof.StoryboardRenderer; -import app.revanced.integrations.youtube.requests.Requester; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; -import org.json.JSONException; -import org.json.JSONObject; +import static app.revanced.integrations.shared.StringRef.str; +import static app.revanced.integrations.youtube.patches.spoof.requests.PlayerRoutes.*; import java.io.IOException; import java.net.HttpURLConnection; @@ -16,8 +9,16 @@ import java.net.SocketTimeoutException; import java.nio.charset.StandardCharsets; import java.util.Objects; -import static app.revanced.integrations.shared.StringRef.str; -import static app.revanced.integrations.youtube.patches.spoof.requests.PlayerRoutes.*; +import org.json.JSONException; +import org.json.JSONObject; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.shared.settings.BaseSettings; +import app.revanced.integrations.youtube.patches.spoof.StoryboardRenderer; +import app.revanced.integrations.youtube.requests.Requester; @Deprecated public class StoryboardRendererRequester { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/theme/ProgressBarDrawable.java b/app/src/main/java/app/revanced/integrations/youtube/patches/theme/ProgressBarDrawable.java index 13ab20c6..2bfc2f63 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/theme/ProgressBarDrawable.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/theme/ProgressBarDrawable.java @@ -5,10 +5,8 @@ import android.graphics.ColorFilter; import android.graphics.Paint; import android.graphics.PixelFormat; import android.graphics.drawable.Drawable; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; - import app.revanced.integrations.youtube.patches.HideSeekbarPatch; import app.revanced.integrations.youtube.settings.Settings; diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/theme/SeekbarColorPatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/theme/SeekbarColorPatch.java index 17caa5f6..aa9eb75e 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/theme/SeekbarColorPatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/theme/SeekbarColorPatch.java @@ -3,10 +3,9 @@ package app.revanced.integrations.youtube.patches.theme; import static app.revanced.integrations.shared.StringRef.str; import android.graphics.Color; - -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public final class SeekbarColorPatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/patches/theme/ThemePatch.java b/app/src/main/java/app/revanced/integrations/youtube/patches/theme/ThemePatch.java index 8cb0cded..90059ec9 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/patches/theme/ThemePatch.java +++ b/app/src/main/java/app/revanced/integrations/youtube/patches/theme/ThemePatch.java @@ -1,8 +1,8 @@ package app.revanced.integrations.youtube.patches.theme; -import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.ThemeHelper; +import app.revanced.integrations.youtube.settings.Settings; @SuppressWarnings("unused") public class ThemePatch { diff --git a/app/src/main/java/app/revanced/integrations/youtube/requests/Requester.java b/app/src/main/java/app/revanced/integrations/youtube/requests/Requester.java index 5c109f98..0e9a5e7c 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/requests/Requester.java +++ b/app/src/main/java/app/revanced/integrations/youtube/requests/Requester.java @@ -1,10 +1,5 @@ package app.revanced.integrations.youtube.requests; -import app.revanced.integrations.shared.Utils; -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import java.io.BufferedReader; import java.io.IOException; import java.io.InputStream; @@ -12,6 +7,12 @@ import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URL; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import app.revanced.integrations.shared.Utils; + public class Requester { private Requester() { } diff --git a/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/ReturnYouTubeDislike.java b/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/ReturnYouTubeDislike.java index bfff1b15..5ac73e7d 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/ReturnYouTubeDislike.java +++ b/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/ReturnYouTubeDislike.java @@ -2,6 +2,13 @@ package app.revanced.integrations.youtube.returnyoutubedislike; import static app.revanced.integrations.shared.StringRef.str; +import java.text.NumberFormat; +import java.util.HashMap; +import java.util.Locale; +import java.util.Map; +import java.util.Objects; +import java.util.concurrent.*; + import android.graphics.Canvas; import android.graphics.Paint; import android.graphics.Rect; @@ -20,23 +27,9 @@ import android.text.style.ImageSpan; import android.text.style.ReplacementSpan; import android.util.DisplayMetrics; import android.util.TypedValue; - import androidx.annotation.GuardedBy; import androidx.annotation.NonNull; import androidx.annotation.Nullable; - -import java.text.NumberFormat; -import java.util.HashMap; -import java.util.Locale; -import java.util.Map; -import java.util.Objects; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.Future; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.TimeoutException; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.ThemeHelper; diff --git a/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/RYDVoteData.java b/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/RYDVoteData.java index 820c0492..0101e9c3 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/RYDVoteData.java +++ b/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/RYDVoteData.java @@ -2,11 +2,11 @@ package app.revanced.integrations.youtube.returnyoutubedislike.requests; import static app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike.Vote; -import androidx.annotation.NonNull; - import org.json.JSONException; import org.json.JSONObject; +import androidx.annotation.NonNull; + /** * ReturnYouTubeDislike API estimated like/dislike/view counts. * diff --git a/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java b/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java index 73db5f00..21850c11 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java +++ b/app/src/main/java/app/revanced/integrations/youtube/returnyoutubedislike/requests/ReturnYouTubeDislikeApi.java @@ -1,15 +1,7 @@ package app.revanced.integrations.youtube.returnyoutubedislike.requests; -import static app.revanced.integrations.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeRoutes.getRYDConnectionFromRoute; import static app.revanced.integrations.shared.StringRef.str; - -import android.util.Base64; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import org.json.JSONException; -import org.json.JSONObject; +import static app.revanced.integrations.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeRoutes.getRYDConnectionFromRoute; import java.io.IOException; import java.io.OutputStream; @@ -22,11 +14,17 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.util.Objects; +import org.json.JSONException; +import org.json.JSONObject; + +import android.util.Base64; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.requests.Requester; import app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike; import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; public class ReturnYouTubeDislikeApi { /** diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/LicenseActivityHook.java b/app/src/main/java/app/revanced/integrations/youtube/settings/LicenseActivityHook.java index 3f51c803..f1bf62c7 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/LicenseActivityHook.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/LicenseActivityHook.java @@ -1,5 +1,10 @@ package app.revanced.integrations.youtube.settings; +import static app.revanced.integrations.shared.Utils.getChildView; +import static app.revanced.integrations.shared.Utils.getResourceIdentifier; + +import java.util.Objects; + import android.annotation.SuppressLint; import android.app.Activity; import android.preference.PreferenceFragment; @@ -12,11 +17,6 @@ import app.revanced.integrations.youtube.settings.preference.ReVancedPreferenceF import app.revanced.integrations.youtube.settings.preference.ReturnYouTubeDislikePreferenceFragment; import app.revanced.integrations.youtube.settings.preference.SponsorBlockPreferenceFragment; -import java.util.Objects; - -import static app.revanced.integrations.shared.Utils.getChildView; -import static app.revanced.integrations.shared.Utils.getResourceIdentifier; - /** * Hooks LicenseActivity. *

diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java index 6d2b7224..38020aab 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/Settings.java @@ -1,5 +1,14 @@ package app.revanced.integrations.youtube.settings; +import static app.revanced.integrations.shared.settings.Setting.*; +import static app.revanced.integrations.youtube.sponsorblock.objects.CategoryBehaviour.*; +import static java.lang.Boolean.FALSE; +import static java.lang.Boolean.TRUE; + +import java.util.Arrays; +import java.util.HashSet; +import java.util.Set; + import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.settings.*; import app.revanced.integrations.shared.settings.preference.SharedPrefCategory; @@ -10,15 +19,6 @@ import app.revanced.integrations.youtube.patches.AlternativeThumbnailsPatch.Thum import app.revanced.integrations.youtube.patches.spoof.SpoofAppVersionPatch; import app.revanced.integrations.youtube.sponsorblock.SponsorBlockSettings; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -import static app.revanced.integrations.shared.settings.Setting.*; -import static app.revanced.integrations.youtube.sponsorblock.objects.CategoryBehaviour.*; -import static java.lang.Boolean.FALSE; -import static java.lang.Boolean.TRUE; - public class Settings extends BaseSettings { // External downloader public static final BooleanSetting EXTERNAL_DOWNLOADER = new BooleanSetting("revanced_external_downloader", FALSE); diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReVancedPreferenceFragment.java b/app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReVancedPreferenceFragment.java index 1f3bd6c0..f065e8d7 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReVancedPreferenceFragment.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReVancedPreferenceFragment.java @@ -3,13 +3,9 @@ package app.revanced.integrations.youtube.settings.preference; import android.os.Build; import android.preference.ListPreference; import android.preference.Preference; -import android.preference.PreferenceGroup; - import androidx.annotation.RequiresApi; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.settings.preference.AbstractPreferenceFragment; -import app.revanced.integrations.youtube.patches.DownloadsPatch; import app.revanced.integrations.youtube.patches.playback.speed.CustomPlaybackSpeedPatch; import app.revanced.integrations.youtube.settings.Settings; diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java b/app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java index 117c2f99..a98ea7b8 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/preference/ReturnYouTubeDislikePreferenceFragment.java @@ -6,16 +6,10 @@ import android.app.Activity; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.preference.Preference; -import android.preference.PreferenceCategory; -import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; -import android.preference.PreferenceScreen; -import android.preference.SwitchPreference; - +import android.preference.*; import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.settings.Setting; import app.revanced.integrations.shared.settings.BaseSettings; +import app.revanced.integrations.shared.settings.Setting; import app.revanced.integrations.youtube.patches.ReturnYouTubeDislikePatch; import app.revanced.integrations.youtube.returnyoutubedislike.ReturnYouTubeDislike; import app.revanced.integrations.youtube.returnyoutubedislike.requests.ReturnYouTubeDislikeApi; diff --git a/app/src/main/java/app/revanced/integrations/youtube/settings/preference/SponsorBlockPreferenceFragment.java b/app/src/main/java/app/revanced/integrations/youtube/settings/preference/SponsorBlockPreferenceFragment.java index 137509d8..852936c6 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/settings/preference/SponsorBlockPreferenceFragment.java +++ b/app/src/main/java/app/revanced/integrations/youtube/settings/preference/SponsorBlockPreferenceFragment.java @@ -1,5 +1,8 @@ package app.revanced.integrations.youtube.settings.preference; +import static android.text.Html.fromHtml; +import static app.revanced.integrations.shared.StringRef.str; + import android.app.Activity; import android.app.AlertDialog; import android.content.Context; @@ -28,9 +31,6 @@ import app.revanced.integrations.youtube.sponsorblock.objects.UserStats; import app.revanced.integrations.youtube.sponsorblock.requests.SBRequester; import app.revanced.integrations.youtube.sponsorblock.ui.SponsorBlockViewController; -import static android.text.Html.fromHtml; -import static app.revanced.integrations.shared.StringRef.str; - @SuppressWarnings("deprecation") public class SponsorBlockPreferenceFragment extends PreferenceFragment { diff --git a/app/src/main/java/app/revanced/integrations/youtube/shared/NavigationBar.java b/app/src/main/java/app/revanced/integrations/youtube/shared/NavigationBar.java index 4cec2680..e40e66c4 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/shared/NavigationBar.java +++ b/app/src/main/java/app/revanced/integrations/youtube/shared/NavigationBar.java @@ -2,14 +2,12 @@ package app.revanced.integrations.youtube.shared; import static app.revanced.integrations.youtube.shared.NavigationBar.NavigationButton.CREATE; +import java.lang.ref.WeakReference; + import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; - import androidx.annotation.Nullable; - -import java.lang.ref.WeakReference; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.settings.Settings; diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SegmentPlaybackController.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SegmentPlaybackController.java index 9a35adce..250319fd 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SegmentPlaybackController.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SegmentPlaybackController.java @@ -2,21 +2,15 @@ package app.revanced.integrations.youtube.sponsorblock; import static app.revanced.integrations.shared.StringRef.str; +import java.lang.reflect.Field; +import java.util.*; + import android.graphics.Canvas; import android.graphics.Rect; import android.text.TextUtils; import android.util.TypedValue; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; - -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Iterator; -import java.util.List; -import java.util.Objects; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.patches.VideoInformation; diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockSettings.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockSettings.java index 084bbf52..6f14fa04 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockSettings.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockSettings.java @@ -2,18 +2,16 @@ package app.revanced.integrations.youtube.sponsorblock; import static app.revanced.integrations.shared.StringRef.str; -import android.app.AlertDialog; -import android.content.Context; -import android.util.Patterns; - -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; +import java.util.UUID; import org.json.JSONArray; import org.json.JSONObject; -import java.util.UUID; - +import android.app.AlertDialog; +import android.content.Context; +import android.util.Patterns; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.shared.settings.Setting; diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockUtils.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockUtils.java index a8ec384f..454a4301 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockUtils.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/SponsorBlockUtils.java @@ -2,15 +2,6 @@ package app.revanced.integrations.youtube.sponsorblock; import static app.revanced.integrations.shared.StringRef.str; -import android.annotation.SuppressLint; -import android.app.AlertDialog; -import android.content.Context; -import android.content.DialogInterface; -import android.text.Html; -import android.widget.EditText; - -import androidx.annotation.NonNull; - import java.lang.ref.WeakReference; import java.text.NumberFormat; import java.text.ParseException; @@ -20,6 +11,15 @@ import java.util.Date; import java.util.Objects; import java.util.TimeZone; +import android.annotation.SuppressLint; +import android.app.AlertDialog; +import android.content.Context; +import android.content.DialogInterface; +import android.text.Html; +import android.widget.EditText; +import androidx.annotation.NonNull; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.patches.VideoInformation; import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.sponsorblock.objects.CategoryBehaviour; @@ -28,8 +28,6 @@ import app.revanced.integrations.youtube.sponsorblock.objects.SponsorSegment; import app.revanced.integrations.youtube.sponsorblock.objects.SponsorSegment.SegmentVote; import app.revanced.integrations.youtube.sponsorblock.requests.SBRequester; import app.revanced.integrations.youtube.sponsorblock.ui.SponsorBlockViewController; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; /** * Not thread safe. All fields/methods must be accessed from the main thread. diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/CategoryBehaviour.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/CategoryBehaviour.java index d34a8e64..f3438aed 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/CategoryBehaviour.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/CategoryBehaviour.java @@ -2,13 +2,12 @@ package app.revanced.integrations.youtube.sponsorblock.objects; import static app.revanced.integrations.shared.StringRef.sf; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import java.util.Objects; -import app.revanced.integrations.shared.Utils; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import app.revanced.integrations.shared.StringRef; +import app.revanced.integrations.shared.Utils; public enum CategoryBehaviour { SKIP_AUTOMATICALLY("skip", 2, true, sf("revanced_sb_skip_automatically")), diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SegmentCategory.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SegmentCategory.java index 03d74b3b..e9e70165 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SegmentCategory.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SegmentCategory.java @@ -1,28 +1,22 @@ package app.revanced.integrations.youtube.sponsorblock.objects; -import static app.revanced.integrations.youtube.settings.Settings.*; import static app.revanced.integrations.shared.StringRef.sf; +import static app.revanced.integrations.youtube.settings.Settings.*; + +import java.util.*; import android.graphics.Color; import android.graphics.Paint; import android.text.Html; import android.text.Spanned; import android.text.TextUtils; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; - +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.StringRef; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.shared.settings.StringSetting; import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.StringRef; public enum SegmentCategory { SPONSOR("sponsor", sf("revanced_sb_segments_sponsor"), sf("revanced_sb_segments_sponsor_sum"), sf("revanced_sb_skip_button_sponsor"), sf("revanced_sb_skipped_sponsor"), diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SegmentCategoryListPreference.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SegmentCategoryListPreference.java index 09235e85..d1f94478 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SegmentCategoryListPreference.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SegmentCategoryListPreference.java @@ -2,6 +2,8 @@ package app.revanced.integrations.youtube.sponsorblock.objects; import static app.revanced.integrations.shared.StringRef.str; +import java.util.Objects; + import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; @@ -10,14 +12,7 @@ import android.preference.ListPreference; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; -import android.widget.EditText; -import android.widget.LinearLayout; -import android.widget.TableLayout; -import android.widget.TableRow; -import android.widget.TextView; - -import java.util.Objects; - +import android.widget.*; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SponsorSegment.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SponsorSegment.java index 7e8d529e..4c8e7db3 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SponsorSegment.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/SponsorSegment.java @@ -1,13 +1,13 @@ package app.revanced.integrations.youtube.sponsorblock.objects; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import app.revanced.integrations.youtube.patches.VideoInformation; -import app.revanced.integrations.shared.StringRef; +import static app.revanced.integrations.shared.StringRef.sf; import java.util.Objects; -import static app.revanced.integrations.shared.StringRef.sf; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import app.revanced.integrations.shared.StringRef; +import app.revanced.integrations.youtube.patches.VideoInformation; public class SponsorSegment implements Comparable { public enum SegmentVote { diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/UserStats.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/UserStats.java index f74b22e5..6980cec5 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/UserStats.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/objects/UserStats.java @@ -1,10 +1,10 @@ package app.revanced.integrations.youtube.sponsorblock.objects; -import androidx.annotation.NonNull; - import org.json.JSONException; import org.json.JSONObject; +import androidx.annotation.NonNull; + /** * SponsorBlock user stats */ diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/requests/SBRequester.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/requests/SBRequester.java index 020fd038..5ce4a6dd 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/requests/SBRequester.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/requests/SBRequester.java @@ -2,13 +2,6 @@ package app.revanced.integrations.youtube.sponsorblock.requests; import static app.revanced.integrations.shared.StringRef.str; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - -import org.json.JSONArray; -import org.json.JSONException; -import org.json.JSONObject; - import java.io.IOException; import java.net.HttpURLConnection; import java.net.SocketTimeoutException; @@ -17,6 +10,14 @@ import java.util.List; import java.util.Locale; import java.util.concurrent.TimeUnit; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.requests.Requester; import app.revanced.integrations.youtube.requests.Route; import app.revanced.integrations.youtube.settings.Settings; @@ -25,8 +26,6 @@ import app.revanced.integrations.youtube.sponsorblock.objects.SegmentCategory; import app.revanced.integrations.youtube.sponsorblock.objects.SponsorSegment; import app.revanced.integrations.youtube.sponsorblock.objects.SponsorSegment.SegmentVote; import app.revanced.integrations.youtube.sponsorblock.objects.UserStats; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; public class SBRequester { private static final String TIME_TEMPLATE = "%.3f"; diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/CreateSegmentButtonController.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/CreateSegmentButtonController.java index dffdf9ff..3803f3ec 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/CreateSegmentButtonController.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/CreateSegmentButtonController.java @@ -2,16 +2,15 @@ package app.revanced.integrations.youtube.sponsorblock.ui; import static app.revanced.integrations.shared.Utils.getResourceIdentifier; -import android.view.View; -import android.widget.ImageView; - import java.lang.ref.WeakReference; import java.util.Objects; -import app.revanced.integrations.youtube.patches.VideoInformation; -import app.revanced.integrations.youtube.settings.Settings; +import android.view.View; +import android.widget.ImageView; import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; +import app.revanced.integrations.youtube.patches.VideoInformation; +import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.videoplayer.BottomControlButton; public class CreateSegmentButtonController { diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/NewSegmentLayout.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/NewSegmentLayout.java index d5ee7f42..dce3ae09 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/NewSegmentLayout.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/NewSegmentLayout.java @@ -1,5 +1,8 @@ package app.revanced.integrations.youtube.sponsorblock.ui; +import static app.revanced.integrations.shared.Utils.getResourceDimensionPixelSize; +import static app.revanced.integrations.shared.Utils.getResourceIdentifier; + import android.content.Context; import android.content.res.ColorStateList; import android.graphics.drawable.RippleDrawable; @@ -8,14 +11,10 @@ import android.util.TypedValue; import android.view.LayoutInflater; import android.widget.FrameLayout; import android.widget.ImageButton; - +import app.revanced.integrations.shared.Logger; import app.revanced.integrations.youtube.patches.VideoInformation; import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.sponsorblock.SponsorBlockUtils; -import app.revanced.integrations.shared.Logger; - -import static app.revanced.integrations.shared.Utils.getResourceDimensionPixelSize; -import static app.revanced.integrations.shared.Utils.getResourceIdentifier; public final class NewSegmentLayout extends FrameLayout { private static final ColorStateList rippleColorStateList = new ColorStateList( diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/SkipSponsorButton.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/SkipSponsorButton.java index f3b954d4..fc63ea42 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/SkipSponsorButton.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/SkipSponsorButton.java @@ -1,9 +1,8 @@ package app.revanced.integrations.youtube.sponsorblock.ui; -import static app.revanced.integrations.shared.Utils.getResourceColor; -import static app.revanced.integrations.shared.Utils.getResourceDimension; -import static app.revanced.integrations.shared.Utils.getResourceDimensionPixelSize; -import static app.revanced.integrations.shared.Utils.getResourceIdentifier; +import static app.revanced.integrations.shared.Utils.*; + +import java.util.Objects; import android.content.Context; import android.graphics.Canvas; @@ -14,11 +13,7 @@ import android.view.View; import android.widget.FrameLayout; import android.widget.LinearLayout; import android.widget.TextView; - import androidx.annotation.NonNull; - -import java.util.Objects; - import app.revanced.integrations.youtube.sponsorblock.SegmentPlaybackController; import app.revanced.integrations.youtube.sponsorblock.objects.SponsorSegment; diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/SponsorBlockViewController.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/SponsorBlockViewController.java index 12deeb83..4b4bc3af 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/SponsorBlockViewController.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/SponsorBlockViewController.java @@ -2,18 +2,16 @@ package app.revanced.integrations.youtube.sponsorblock.ui; import static app.revanced.integrations.shared.Utils.getResourceIdentifier; +import java.lang.ref.WeakReference; +import java.util.Objects; + import android.content.Context; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.RelativeLayout; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; - -import java.lang.ref.WeakReference; -import java.util.Objects; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.settings.Settings; diff --git a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/VotingButtonController.java b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/VotingButtonController.java index 581ba1ad..5ff256e6 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/VotingButtonController.java +++ b/app/src/main/java/app/revanced/integrations/youtube/sponsorblock/ui/VotingButtonController.java @@ -2,18 +2,17 @@ package app.revanced.integrations.youtube.sponsorblock.ui; import static app.revanced.integrations.shared.Utils.getResourceIdentifier; -import android.view.View; -import android.widget.ImageView; - import java.lang.ref.WeakReference; import java.util.Objects; +import android.view.View; +import android.widget.ImageView; +import app.revanced.integrations.shared.Logger; +import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.patches.VideoInformation; import app.revanced.integrations.youtube.settings.Settings; import app.revanced.integrations.youtube.sponsorblock.SegmentPlaybackController; import app.revanced.integrations.youtube.sponsorblock.SponsorBlockUtils; -import app.revanced.integrations.shared.Logger; -import app.revanced.integrations.shared.Utils; import app.revanced.integrations.youtube.videoplayer.BottomControlButton; public class VotingButtonController { diff --git a/app/src/main/java/app/revanced/integrations/youtube/videoplayer/BottomControlButton.java b/app/src/main/java/app/revanced/integrations/youtube/videoplayer/BottomControlButton.java index aacd9367..f35d4e07 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/videoplayer/BottomControlButton.java +++ b/app/src/main/java/app/revanced/integrations/youtube/videoplayer/BottomControlButton.java @@ -1,16 +1,14 @@ package app.revanced.integrations.youtube.videoplayer; +import java.lang.ref.WeakReference; +import java.util.Objects; + import android.view.View; import android.view.ViewGroup; import android.view.animation.Animation; import android.widget.ImageView; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; - -import java.lang.ref.WeakReference; -import java.util.Objects; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.shared.Utils; import app.revanced.integrations.shared.settings.BooleanSetting; diff --git a/app/src/main/java/app/revanced/integrations/youtube/videoplayer/CopyVideoUrlButton.java b/app/src/main/java/app/revanced/integrations/youtube/videoplayer/CopyVideoUrlButton.java index 5995da96..677fd2ae 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/videoplayer/CopyVideoUrlButton.java +++ b/app/src/main/java/app/revanced/integrations/youtube/videoplayer/CopyVideoUrlButton.java @@ -2,12 +2,10 @@ package app.revanced.integrations.youtube.videoplayer; import android.view.View; import android.view.ViewGroup; - import androidx.annotation.Nullable; - +import app.revanced.integrations.shared.Logger; import app.revanced.integrations.youtube.patches.CopyVideoUrlPatch; import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Logger; public class CopyVideoUrlButton extends BottomControlButton { @Nullable diff --git a/app/src/main/java/app/revanced/integrations/youtube/videoplayer/CopyVideoUrlTimestampButton.java b/app/src/main/java/app/revanced/integrations/youtube/videoplayer/CopyVideoUrlTimestampButton.java index 41af50ac..836a5a95 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/videoplayer/CopyVideoUrlTimestampButton.java +++ b/app/src/main/java/app/revanced/integrations/youtube/videoplayer/CopyVideoUrlTimestampButton.java @@ -2,12 +2,10 @@ package app.revanced.integrations.youtube.videoplayer; import android.view.View; import android.view.ViewGroup; - import androidx.annotation.Nullable; - +import app.revanced.integrations.shared.Logger; import app.revanced.integrations.youtube.patches.CopyVideoUrlPatch; import app.revanced.integrations.youtube.settings.Settings; -import app.revanced.integrations.shared.Logger; public class CopyVideoUrlTimestampButton extends BottomControlButton { @Nullable diff --git a/app/src/main/java/app/revanced/integrations/youtube/videoplayer/ExternalDownloadButton.java b/app/src/main/java/app/revanced/integrations/youtube/videoplayer/ExternalDownloadButton.java index 2a902b02..bbb39bfa 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/videoplayer/ExternalDownloadButton.java +++ b/app/src/main/java/app/revanced/integrations/youtube/videoplayer/ExternalDownloadButton.java @@ -2,9 +2,7 @@ package app.revanced.integrations.youtube.videoplayer; import android.view.View; import android.view.ViewGroup; - import androidx.annotation.Nullable; - import app.revanced.integrations.shared.Logger; import app.revanced.integrations.youtube.patches.DownloadsPatch; import app.revanced.integrations.youtube.patches.VideoInformation;