From e56fdf1cfe034c67c6a59b07e96470a7ade94c3f Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Mon, 1 Apr 2024 01:33:56 +0400 Subject: [PATCH 1/3] fix: Use consistent formatter settings between IntelliJ and Android Studio --- .editorconfig | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/.editorconfig b/.editorconfig index 2d6d258f47..b8024f0559 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,17 @@ +[*] +max_line_length = off + +[*.java] +ij_java_imports_layout = $*,|,java.**,|,javax.**,|,org.**,|,net.**,|,com.**,|,* + [*.{kt,kts}] -ktlint_code_style = intellij_idea -ktlint_standard_no-wildcard-imports = disabled \ No newline at end of file +# ktlint entries are for ktlint gradle task and ktlint Intellij / Android Studio plugin. +# Ignore all 'property not supported' warnings, these are correct. +ktlint_code_style = android_studio +ktlint_standard_discouraged-comment-location = disabled +ktlint_standard_no-wildcard-imports = disabled +ij_kotlin_imports_layout=* +ij_kotlin_name_count_to_use_star_import = 5 +ij_kotlin_name_count_to_use_star_import_for_members = 5 +ij_kotlin_allow_trailing_comma_on_call_site = false +ij_kotlin_allow_trailing_comma = false From 2e65ad234c3be34ced421f8892c61f2c98d48ac0 Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Mon, 1 Apr 2024 02:11:49 +0400 Subject: [PATCH 2/3] chore: organize imports --- .../wifi/spoof/SpoofWifiPatch.java | 7 +--- .../RemoveScreencaptureRestrictionPatch.java | 1 - .../patches/FilterPromotedLinksPatch.java | 4 +- .../integrations/shared/GmsCoreSupport.java | 10 ++--- .../revanced/integrations/shared/Logger.java | 12 ++---- .../integrations/shared/StringRef.java | 9 ++-- .../revanced/integrations/shared/Utils.java | 23 ++++------- .../shared/settings/BaseSettings.java | 2 +- .../shared/settings/BooleanSetting.java | 6 +-- .../shared/settings/EnumSetting.java | 11 ++--- .../shared/settings/FloatSetting.java | 6 +-- .../shared/settings/IntegerSetting.java | 6 +-- .../shared/settings/LongSetting.java | 6 +-- .../integrations/shared/settings/Setting.java | 15 +++---- .../shared/settings/StringSetting.java | 6 +-- .../AbstractPreferenceFragment.java | 5 +-- .../preference/ImportExportPreference.java | 6 +-- .../ResettableEditTextPreference.java | 10 ++--- .../preference/SharedPrefCategory.java | 4 +- .../syncforreddit/FixSLinksPatch.java | 6 +-- .../tiktok/feedfilter/AdsFilter.java | 3 +- .../tiktok/feedfilter/FeedItemsFilter.java | 6 +-- .../tiktok/feedfilter/ImageVideoFilter.java | 3 +- .../tiktok/feedfilter/LikeCountFilter.java | 5 ++- .../tiktok/feedfilter/LiveFilter.java | 3 +- .../tiktok/feedfilter/StoryFilter.java | 3 +- .../tiktok/feedfilter/ViewCountFilter.java | 5 ++- .../AdPersonalizationActivityHook.java | 9 ++-- .../preference/DownloadPathPreference.java | 1 - .../preference/InputTextPreference.java | 1 - .../preference/RangeValuePreference.java | 1 - .../ReVancedPreferenceFragment.java | 3 +- .../settings/preference/TogglePreference.java | 1 - .../FeedFilterPreferenceCategory.java | 2 +- .../IntegrationsPreferenceCategory.java | 1 - .../lockscreen/ShowOnLockscreenPatch.java | 6 +-- .../tumblr/patches/TimelineFilterPatch.java | 6 +-- .../twitch/adblock/LuminousService.java | 4 +- .../twitch/adblock/PurpleAdblockService.java | 10 ++--- .../twitch/api/RequestInterceptor.java | 8 ++-- .../patches/ShowDeletedMessagesPatch.java | 2 - .../settings/AppCompatActivityHook.java | 6 +-- .../twitch/settings/Settings.java | 8 ++-- .../patches/hook/json/JsonHookPatch.kt | 2 +- .../twitter/utils/json/JsonUtils.kt | 4 +- .../integrations/youtube/ByteTrieSearch.java | 4 +- .../integrations/youtube/TrieSearch.java | 6 +-- .../patches/AlternativeThumbnailsPatch.java | 41 ++++++++----------- .../patches/BypassURLRedirectsPatch.java | 3 +- .../youtube/patches/CopyVideoUrlPatch.java | 1 - .../CustomPlayerOverlayOpacityPatch.java | 3 +- .../DisablePreciseSeekingGesturePatch.java | 1 - .../DisableSuggestedVideoEndScreenPatch.java | 6 --- .../youtube/patches/DownloadsPatch.java | 8 ++-- .../patches/FixBackToExitGesturePatch.java | 1 - .../patches/FullscreenPanelsRemoverPatch.java | 1 - .../patches/HDRAutoBrightnessPatch.java | 1 - .../youtube/patches/HideAlbumCardsPatch.java | 3 +- .../patches/HideBreakingNewsPatch.java | 3 +- .../patches/HideCaptionsButtonPatch.java | 1 - .../youtube/patches/HideCastButtonPatch.java | 1 - .../patches/HideCrowdfundingBoxPatch.java | 3 +- .../patches/HideEndscreenCardsPatch.java | 1 - .../youtube/patches/HideFilterBarPatch.java | 3 +- .../youtube/patches/HideInfoCardsPatch.java | 1 - .../patches/HideLoadMoreButtonPatch.java | 3 +- .../patches/NavigationButtonsPatch.java | 4 +- .../patches/PlayerOverlaysHookPatch.java | 3 -- .../youtube/patches/PlayerTypeHookPatch.java | 1 - .../patches/ReturnYouTubeDislikePatch.java | 19 ++++----- .../youtube/patches/VideoInformation.java | 12 +++--- .../announcements/AnnouncementsPatch.java | 24 +++++------ .../requests/AnnouncementsRoutes.java | 6 +-- .../youtube/patches/components/AdsFilter.java | 4 +- .../patches/components/ButtonsFilter.java | 1 - .../patches/components/CustomFilter.java | 11 ++--- .../DescriptionComponentsFilter.java | 2 +- .../components/KeywordContentFilter.java | 10 ++--- .../components/LayoutComponentsFilter.java | 4 +- .../patches/components/LithoFilterPatch.java | 15 +++---- .../PlaybackSpeedMenuFilterPatch.java | 1 - .../PlayerFlyoutMenuItemsFilter.java | 2 - .../ReturnYouTubeDislikeFilterPatch.java | 11 +++-- .../patches/components/ShortsFilter.java | 6 +-- .../VideoQualityMenuFilterPatch.java | 1 - .../quality/RememberVideoQualityPatch.java | 15 ++++--- .../RestoreOldVideoQualityMenuPatch.java | 3 +- .../speed/CustomPlaybackSpeedPatch.java | 9 ++-- .../speed/RememberPlaybackSpeedPatch.java | 4 +- .../patches/spoof/SpoofSignaturePatch.java | 16 ++++---- .../patches/spoof/StoryboardRenderer.java | 4 +- .../patches/spoof/requests/PlayerRoutes.java | 13 +++--- .../requests/StoryboardRendererRequester.java | 23 ++++++----- .../patches/theme/ProgressBarDrawable.java | 2 - .../patches/theme/SeekbarColorPatch.java | 3 +- .../youtube/patches/theme/ThemePatch.java | 2 +- .../youtube/requests/Requester.java | 11 ++--- .../ReturnYouTubeDislike.java | 21 ++++------ .../requests/RYDVoteData.java | 4 +- .../requests/ReturnYouTubeDislikeApi.java | 20 ++++----- .../youtube/settings/LicenseActivityHook.java | 10 ++--- .../youtube/settings/Settings.java | 18 ++++---- .../ReVancedPreferenceFragment.java | 4 -- ...eturnYouTubeDislikePreferenceFragment.java | 10 +---- .../SponsorBlockPreferenceFragment.java | 6 +-- .../youtube/shared/NavigationBar.java | 6 +-- .../SegmentPlaybackController.java | 12 ++---- .../sponsorblock/SponsorBlockSettings.java | 12 +++--- .../sponsorblock/SponsorBlockUtils.java | 20 ++++----- .../objects/CategoryBehaviour.java | 7 ++-- .../sponsorblock/objects/SegmentCategory.java | 16 +++----- .../SegmentCategoryListPreference.java | 11 ++--- .../sponsorblock/objects/SponsorSegment.java | 10 ++--- .../sponsorblock/objects/UserStats.java | 4 +- .../sponsorblock/requests/SBRequester.java | 17 ++++---- .../ui/CreateSegmentButtonController.java | 9 ++-- .../sponsorblock/ui/NewSegmentLayout.java | 9 ++-- .../sponsorblock/ui/SkipSponsorButton.java | 11 ++--- .../ui/SponsorBlockViewController.java | 8 ++-- .../ui/VotingButtonController.java | 9 ++-- .../videoplayer/BottomControlButton.java | 8 ++-- .../videoplayer/CopyVideoUrlButton.java | 4 +- .../CopyVideoUrlTimestampButton.java | 4 +- .../videoplayer/ExternalDownloadButton.java | 2 - 124 files changed, 363 insertions(+), 504 deletions(-) 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 75bb5bf589..8c797f69ba 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 @@ 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 c76d395d77..8f4893474b 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 @@ 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 de8469e2bb..6b731deb09 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 bab1a99402..da96d367c1 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.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 2588505007..8ff12835d3 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 2c3b9110dd..29d7a2f26f 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 371100d1b7..a733a83be4 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.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 c5283491d7..a96926cdff 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 bc20f8c294..e6ca9c13c0 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 20ef4821e0..75193b82d8 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 androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import app.revanced.integrations.shared.Logger; +import java.util.Locale; +import java.util.Objects; + import org.json.JSONException; import org.json.JSONObject; -import java.util.Locale; -import java.util.Objects; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import app.revanced.integrations.shared.Logger; /** * 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 6729f67a83..20e16964aa 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 414de1569a..a9cba52d0f 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 1c7287a8f7..bc4c5f5868 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 f5f7b890e9..f4f4d77a6e 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.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 247cc00cac..6e32eb7be2 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 34a348a371..3eb58bba46 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.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 0a9b54c1dd..b8a2d191a0 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.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 804b51c400..733d56d08f 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.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 9c7fa45ca8..115b487ea3 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 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 a3c04ad616..5cd02fbd59 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 c246e6226d..31bbe97175 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 d74ea59ecc..3cf46420b0 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 50472197e8..2e326a8ff0 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 7815283dbf..b4c9ffb6c5 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 bec7f11c48..89fdc4a054 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 2c209d0dd9..2e56c3af68 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 637401af17..f565980dd5 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 2e4812e4c9..38c7066b8a 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 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 8bf8a40f36..f6d2c5a583 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.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 7a10339159..aeb78c814c 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 @@ 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 1c83b18cbd..72ba88ceb7 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.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 6635935064..9ee1246b0a 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.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 0af4a44ffa..f1959072bb 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 @@ 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 5bb40a2ea3..b6cb5de7f9 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 @@ 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 96e6e892de..fde91bc1bf 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 @@ 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 0d05c9d92c..4e61b75364 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.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 1c1da707cc..a3e650312c 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 72f19ca07f..1b02407e6a 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 c40b06e57e..3e7072f2ec 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 236e72c17d..a1c68a2087 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 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 bdf06ed740..d5e5f8fb8a 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.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 42da779848..97015ee3e2 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 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 8f3969b79d..3923d2edce 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 1eb96cfe89..cd8a719c20 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 80675c80c1..bfab8b16ef 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 aa2b94b8ef..de5d3ff3c0 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 1c927cd2d5..2fd8c0fa23 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 1e0d2e1eeb..0d052be736 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,39 +1,34 @@ package app.revanced.integrations.youtube.patches; +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; +import java.net.URL; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.concurrent.ExecutionException; + +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.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 java.io.IOException; -import java.net.HttpURLConnection; -import java.net.URL; -import java.util.HashMap; -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; - /** * 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 c49f8bbd0f..26fe168468 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 fec49a3445..87e8206d83 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 @@ 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 26bedbb0d6..27bfab2ad7 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 5e3eca57e7..27966506b8 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 @@ 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 0b7897bac0..725789ca0d 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 a9c37d0044..b87c00dfb6 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 d3408a62b0..a0c73cc050 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 6dd8e66705..e71e95e281 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 3c6443083a..09fd6a442f 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 e0d8519446..67a53cd855 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 bd6d89fa57..0286b0a8da 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 d6487b4458..8d9b56433b 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 aec2fbfc08..e09466c5d0 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 6546da78de..5ed4984502 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 36e4727cee..3eb50b70fa 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 dd15c9528c..a775bcf9ff 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 764326dc18..e1036298a7 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 fa3a0e70ef..39b3ad3c17 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 e7406abedd..beeba7e9c8 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 @@ 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 32732cdcc3..cfcdc522f4 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 a669ca9486..09506e672e 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 4938fb3765..7360428794 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.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 57751ff02a..795e9b4a51 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 db1e37554c..0844489103 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,28 +1,28 @@ package app.revanced.integrations.youtube.patches.announcements; +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; +import java.nio.charset.StandardCharsets; +import java.security.MessageDigest; +import java.util.Locale; + +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; -import org.json.JSONObject; - -import java.io.IOException; -import java.net.HttpURLConnection; -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; @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 59273c2bc3..614df54fb9 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 22daf6dd69..2da51ba74c 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 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 a78f9b5af4..87e26578b4 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 51d86b5433..4087bd7101 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 @@ 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 0bf50b15aa..534a27fdb5 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 7858bb7477..437e4f45bf 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.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 f32ad545bc..394ba5a702 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 e1bb9d6780..e96ebcfa03 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 03319588d5..d15948a525 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 19ccfac5ce..27dfe7d3cc 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 927e449341..566c2b6582 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 8c3dbf26be..80d6263140 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 @@ 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 e3d20e2d1e..25cd04193f 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 566792857f..eb276dec15 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 d0a914232a..e96de72751 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.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 e863f8fdbc..ce0ac6593f 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 @@ 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 1782ade6b3..df9e070f3f 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 @@ 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 6573467a37..5459634b48 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.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 8e33729724..b821042977 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 67e6950229..69e129dec4 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,14 +1,15 @@ 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 java.io.IOException; +import java.net.HttpURLConnection; + import org.json.JSONException; import org.json.JSONObject; -import java.io.IOException; -import java.net.HttpURLConnection; +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 { 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 31d8c3ef5d..61440d899d 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.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 13ab20c6f0..2bfc2f6372 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.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 17caa5f6dc..aa9eb75e9f 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 @@ 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 8cb0cded8e..90059ec952 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 5c109f9880..0e9a5e7c0d 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.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 bfff1b155b..5ac73e7d90 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 @@ 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.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 820c0492f3..0101e9c3d9 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 @@ 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 73db5f003f..21850c1156 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.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 3f51c80384..f1bf62c786 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.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 6d2b722455..38020aab04 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.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 1f3bd6c012..f065e8d7bc 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 @@ 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 117c2f9945..a98ea7b8a1 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.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 137509d862..852936c65c 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.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 4cec2680af..e40e66c46a 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 @@ 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 9a35adceda..250319fd7c 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 @@ 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 084bbf5254..6f14fa042a 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 @@ import static app.revanced.integrations.shared.StringRef.str; +import java.util.UUID; + +import org.json.JSONArray; +import org.json.JSONObject; + import android.app.AlertDialog; import android.content.Context; import android.util.Patterns; - import androidx.annotation.NonNull; import androidx.annotation.Nullable; - -import org.json.JSONArray; -import org.json.JSONObject; - -import java.util.UUID; - 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 a8ec384fc0..454a43014a 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 @@ 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.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.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 d34a8e6417..f3438aedc2 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 @@ 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 03d74b3b7a..e9e70165ab 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 09235e8504..d1f944788a 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 @@ 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.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 7e8d529e59..4c8e7db334 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 f74b22e525..6980cec583 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 020fd03849..5ce4a6dd35 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 @@ 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.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.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 dffdf9ff48..3803f3ecb9 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 @@ 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 d5ee7f4278..dce3ae09ed 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.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 f3b954d4f4..fc63ea42ac 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.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 12deeb8342..4b4bc3aff3 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 @@ 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 581ba1ada5..5ff256e6a3 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 @@ 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 aacd93677a..f35d4e07f8 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 5995da96b0..677fd2ae79 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 @@ 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 41af50ac95..836a5a9566 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 @@ 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 2a902b025b..bbb39bfaa2 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 @@ 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; From acd1c725a2ff9764a74520c16644730bf9d78eea Mon Sep 17 00:00:00 2001 From: LisoUseInAIKyrios <118716522+LisoUseInAIKyrios@users.noreply.github.com> Date: Mon, 1 Apr 2024 02:34:46 +0400 Subject: [PATCH 3/3] chore: ktlint reformat --- .../PlayerControlsVisibilityObserver.kt | 2 +- .../youtube/shared/PlayerOverlays.kt | 20 +++++++++---------- .../integrations/youtube/shared/PlayerType.kt | 2 +- .../integrations/youtube/shared/VideoState.kt | 2 +- .../SwipeControlsConfigurationProvider.kt | 2 +- .../SwipeControlsHostActivity.kt | 2 +- .../controller/AudioVolumeController.kt | 4 ++-- .../controller/ScreenBrightnessController.kt | 2 +- .../controller/SwipeZonesController.kt | 10 +++++----- .../controller/VolumeKeysController.kt | 2 +- .../gesture/ClassicSwipeController.kt | 4 ++-- .../gesture/PressToSwipeController.kt | 4 ++-- .../gesture/core/BaseGestureController.kt | 12 +++++------ .../controller/gesture/core/SwipeDetector.kt | 8 ++++---- .../core/VolumeAndBrightnessScroller.kt | 10 +++++----- .../youtube/swipecontrols/misc/Point.kt | 2 +- .../youtube/swipecontrols/misc/Rectangle.kt | 2 +- .../misc/ScrollDistanceHelper.kt | 4 ++-- .../swipecontrols/misc/SwipeControlsUtils.kt | 2 +- .../views/SwipeControlsOverlayLayout.kt | 16 +++++++-------- 20 files changed, 56 insertions(+), 56 deletions(-) diff --git a/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerControlsVisibilityObserver.kt b/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerControlsVisibilityObserver.kt index c31e9d4c05..0f39b180b0 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerControlsVisibilityObserver.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerControlsVisibilityObserver.kt @@ -12,7 +12,7 @@ import java.lang.ref.WeakReference * @param activity activity that contains the controls_layout view */ class PlayerControlsVisibilityObserverImpl( - private val activity: Activity, + private val activity: Activity ) : PlayerControlsVisibilityObserver { /** diff --git a/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerOverlays.kt b/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerOverlays.kt index 9bce2bc4a8..a222ae8534 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerOverlays.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerOverlays.kt @@ -42,8 +42,8 @@ object PlayerOverlays { ChildrenChangeEventArgs( parent, child, - false, - ), + false + ) ) } } @@ -54,8 +54,8 @@ object PlayerOverlays { ChildrenChangeEventArgs( parent, child, - true, - ), + true + ) ) } } @@ -69,15 +69,15 @@ object PlayerOverlays { oldLeft, oldTop, oldRight - oldLeft, - oldBottom - oldTop, + oldBottom - oldTop ), Rectangle( newLeft, newTop, newRight - newLeft, - newBottom - newTop, - ), - ), + newBottom - newTop + ) + ) ) } } @@ -87,11 +87,11 @@ object PlayerOverlays { data class ChildrenChangeEventArgs( val overlaysLayout: ViewGroup, val childView: View, - val wasChildRemoved: Boolean, + val wasChildRemoved: Boolean ) data class LayoutChangeEventArgs( val overlaysLayout: ViewGroup, val oldRect: Rectangle, - val newRect: Rectangle, + val newRect: Rectangle ) diff --git a/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerType.kt b/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerType.kt index 7db4a3fdf5..cbeeb9c9f2 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerType.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/shared/PlayerType.kt @@ -44,7 +44,7 @@ enum class PlayerType { */ INLINE_MINIMAL, VIRTUAL_REALITY_FULLSCREEN, - WATCH_WHILE_PICTURE_IN_PICTURE, + WATCH_WHILE_PICTURE_IN_PICTURE ; companion object { diff --git a/app/src/main/java/app/revanced/integrations/youtube/shared/VideoState.kt b/app/src/main/java/app/revanced/integrations/youtube/shared/VideoState.kt index 75db347b84..92e023ece5 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/shared/VideoState.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/shared/VideoState.kt @@ -16,7 +16,7 @@ enum class VideoState { /** * @see [VideoInformation.isAtEndOfVideo] */ - ENDED, + ENDED ; diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt index 0e2d799797..2f877a5315 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsConfigurationProvider.kt @@ -11,7 +11,7 @@ import app.revanced.integrations.youtube.shared.PlayerType * @param context the context to create in */ class SwipeControlsConfigurationProvider( - private val context: Context, + private val context: Context ) { //region swipe enable /** diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsHostActivity.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsHostActivity.kt index e6f233e830..12cf08ae95 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsHostActivity.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/SwipeControlsHostActivity.kt @@ -143,7 +143,7 @@ class SwipeControlsHostActivity : Activity() { contentRoot.x.toInt(), contentRoot.y.toInt(), contentRoot.width, - contentRoot.height, + contentRoot.height ) } diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/AudioVolumeController.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/AudioVolumeController.kt index f607c1fa77..537dab3ae8 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/AudioVolumeController.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/AudioVolumeController.kt @@ -15,7 +15,7 @@ import kotlin.properties.Delegates */ class AudioVolumeController( context: Context, - private val targetStream: Int = AudioManager.STREAM_MUSIC, + private val targetStream: Int = AudioManager.STREAM_MUSIC ) { /** @@ -36,7 +36,7 @@ class AudioVolumeController( minimumVolumeIndex = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { audioManager.getStreamMinVolume( - targetStream, + targetStream ) } else { 0 diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/ScreenBrightnessController.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/ScreenBrightnessController.kt index 1cf282e892..c7a334567e 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/ScreenBrightnessController.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/ScreenBrightnessController.kt @@ -10,7 +10,7 @@ import app.revanced.integrations.youtube.swipecontrols.misc.clamp * @param host the host activity of which the brightness is adjusted */ class ScreenBrightnessController( - private val host: Activity, + private val host: Activity ) { /** * screen brightness saved by [save] diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/SwipeZonesController.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/SwipeZonesController.kt index 58fddeb585..65564ef668 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/SwipeZonesController.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/SwipeZonesController.kt @@ -36,7 +36,7 @@ import kotlin.math.min @Suppress("PrivatePropertyName") class SwipeZonesController( private val host: Activity, - private val fallbackScreenRect: () -> Rectangle, + private val fallbackScreenRect: () -> Rectangle ) { /** * 20dp, in pixels @@ -74,7 +74,7 @@ class SwipeZonesController( p.x + _20dp, p.y + _40dp, p.width - _20dp, - p.height - _20dp - _80dp, + p.height - _20dp - _80dp ) } @@ -89,7 +89,7 @@ class SwipeZonesController( eRect.right - zoneWidth, eRect.top, zoneWidth, - eRect.height, + eRect.height ) } @@ -103,7 +103,7 @@ class SwipeZonesController( effectiveSwipeRect.left, effectiveSwipeRect.top, zoneWidth, - effectiveSwipeRect.height, + effectiveSwipeRect.height ) } @@ -137,7 +137,7 @@ class SwipeZonesController( playerView.x.toInt(), playerView.y.toInt(), min(playerView.width, playerWidthWithPadding), - playerView.height, + playerView.height ) } } diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/VolumeKeysController.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/VolumeKeysController.kt index 000634b6b6..bb7324e6ef 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/VolumeKeysController.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/VolumeKeysController.kt @@ -9,7 +9,7 @@ import app.revanced.integrations.youtube.swipecontrols.SwipeControlsHostActivity * @param controller main controller instance */ class VolumeKeysController( - private val controller: SwipeControlsHostActivity, + private val controller: SwipeControlsHostActivity ) { /** * key event handler diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt index 3f1c468ff1..a736f2342c 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/ClassicSwipeController.kt @@ -15,7 +15,7 @@ import app.revanced.integrations.youtube.swipecontrols.misc.toPoint * @param controller reference to the main swipe controller */ class ClassicSwipeController( - private val controller: SwipeControlsHostActivity, + private val controller: SwipeControlsHostActivity ) : BaseGestureController(controller), PlayerControlsVisibilityObserver by PlayerControlsVisibilityObserverImpl(controller) { /** @@ -98,7 +98,7 @@ class ClassicSwipeController( from: MotionEvent, to: MotionEvent, distanceX: Double, - distanceY: Double, + distanceY: Double ): Boolean { // cancel if not vertical if (currentSwipe != SwipeDetector.SwipeDirection.VERTICAL) return false diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt index 84faf385d5..37f2d50b5b 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/PressToSwipeController.kt @@ -13,7 +13,7 @@ import app.revanced.integrations.youtube.swipecontrols.misc.toPoint * @param controller reference to the main swipe controller */ class PressToSwipeController( - private val controller: SwipeControlsHostActivity, + private val controller: SwipeControlsHostActivity ) : BaseGestureController(controller) { /** * monitors if the user is currently in a swipe session. @@ -59,7 +59,7 @@ class PressToSwipeController( from: MotionEvent, to: MotionEvent, distanceX: Double, - distanceY: Double, + distanceY: Double ): Boolean { // cancel if not in swipe session or vertical if (!isInSwipeSession || currentSwipe != SwipeDetector.SwipeDirection.VERTICAL) return false diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt index fb5a1b04fb..8640609dab 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/BaseGestureController.kt @@ -11,11 +11,11 @@ import app.revanced.integrations.youtube.swipecontrols.SwipeControlsHostActivity * @param controller reference to the main swipe controller */ abstract class BaseGestureController( - private val controller: SwipeControlsHostActivity, + private val controller: SwipeControlsHostActivity ) : GestureController, GestureDetector.SimpleOnGestureListener(), SwipeDetector by SwipeDetectorImpl( - controller.config.swipeMagnitudeThreshold.toDouble(), + controller.config.swipeMagnitudeThreshold.toDouble() ), VolumeAndBrightnessScroller by VolumeAndBrightnessScrollerImpl( controller, @@ -23,7 +23,7 @@ abstract class BaseGestureController( controller.screen, controller.overlay, 10, - 1, + 1 ) { /** @@ -85,7 +85,7 @@ abstract class BaseGestureController( from: MotionEvent, to: MotionEvent, distanceX: Float, - distanceY: Float, + distanceY: Float ): Boolean { // submit to swipe detector submitForSwipe(from, to, distanceX, distanceY) @@ -96,7 +96,7 @@ abstract class BaseGestureController( from, to, distanceX.toDouble(), - distanceY.toDouble(), + distanceY.toDouble() ) // if the swipe was consumed, cancel downstream events once @@ -151,6 +151,6 @@ abstract class BaseGestureController( from: MotionEvent, to: MotionEvent, distanceX: Double, - distanceY: Double, + distanceY: Double ): Boolean } diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt index 3dc5cc425a..078acfce87 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/SwipeDetector.kt @@ -25,7 +25,7 @@ interface SwipeDetector { from: MotionEvent, to: MotionEvent, distanceX: Float, - distanceY: Float, + distanceY: Float ) /** @@ -50,7 +50,7 @@ interface SwipeDetector { /** * swipe along the Y- Axes */ - VERTICAL, + VERTICAL } } @@ -60,7 +60,7 @@ interface SwipeDetector { * @param swipeMagnitudeThreshold minimum magnitude before a swipe is detected as such */ class SwipeDetectorImpl( - private val swipeMagnitudeThreshold: Double, + private val swipeMagnitudeThreshold: Double ) : SwipeDetector { override var currentSwipe = SwipeDetector.SwipeDirection.NONE @@ -68,7 +68,7 @@ class SwipeDetectorImpl( from: MotionEvent, to: MotionEvent, distanceX: Float, - distanceY: Float, + distanceY: Float ) { if (currentSwipe == SwipeDetector.SwipeDirection.NONE) { // no swipe direction was detected yet, try to detect one diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt index dec14b81a1..758e584a36 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/controller/gesture/core/VolumeAndBrightnessScroller.kt @@ -48,7 +48,7 @@ class VolumeAndBrightnessScrollerImpl( private val screenController: ScreenBrightnessController?, private val overlayController: SwipeControlsOverlay, volumeDistance: Int = 10, - brightnessDistance: Int = 1, + brightnessDistance: Int = 1 ) : VolumeAndBrightnessScroller { // region volume @@ -56,8 +56,8 @@ class VolumeAndBrightnessScrollerImpl( ScrollDistanceHelper( volumeDistance.applyDimension( context, - TypedValue.COMPLEX_UNIT_DIP, - ), + TypedValue.COMPLEX_UNIT_DIP + ) ) { _, _, direction -> volumeController?.run { volume += direction @@ -73,8 +73,8 @@ class VolumeAndBrightnessScrollerImpl( ScrollDistanceHelper( brightnessDistance.applyDimension( context, - TypedValue.COMPLEX_UNIT_DIP, - ), + TypedValue.COMPLEX_UNIT_DIP + ) ) { _, _, direction -> screenController?.run { if (screenBrightness > 0 || direction > 0) { diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Point.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Point.kt index f3d8a966c3..eaca3270eb 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Point.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Point.kt @@ -7,7 +7,7 @@ import android.view.MotionEvent */ data class Point( val x: Int, - val y: Int, + val y: Int ) /** diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Rectangle.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Rectangle.kt index 3195251dc8..c40bae0c31 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Rectangle.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/Rectangle.kt @@ -7,7 +7,7 @@ data class Rectangle( val x: Int, val y: Int, val width: Int, - val height: Int, + val height: Int ) { val left = x val right = x + width diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/ScrollDistanceHelper.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/ScrollDistanceHelper.kt index a85dbac856..c7f2793640 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/ScrollDistanceHelper.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/ScrollDistanceHelper.kt @@ -11,7 +11,7 @@ import kotlin.math.sign */ class ScrollDistanceHelper( private val unitDistance: Int, - private val callback: (oldDistance: Double, newDistance: Double, direction: Int) -> Unit, + private val callback: (oldDistance: Double, newDistance: Double, direction: Int) -> Unit ) { /** @@ -35,7 +35,7 @@ class ScrollDistanceHelper( callback.invoke( oldDistance, scrolledDistance, - sign(scrolledDistance).toInt(), + sign(scrolledDistance).toInt() ) } } diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/SwipeControlsUtils.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/SwipeControlsUtils.kt index 141dc2224d..5638bf7a46 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/SwipeControlsUtils.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/misc/SwipeControlsUtils.kt @@ -20,6 +20,6 @@ fun Int.applyDimension(context: Context, unit: Int): Int { return TypedValue.applyDimension( unit, this.toFloat(), - context.resources.displayMetrics, + context.resources.displayMetrics ).roundToInt() } diff --git a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt index dbe2434f3c..e7058d8c6f 100644 --- a/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt +++ b/app/src/main/java/app/revanced/integrations/youtube/swipecontrols/views/SwipeControlsOverlayLayout.kt @@ -24,7 +24,7 @@ import kotlin.math.round */ class SwipeControlsOverlayLayout( context: Context, - private val config: SwipeControlsConfigurationProvider, + private val config: SwipeControlsConfigurationProvider ) : RelativeLayout(context), SwipeControlsOverlay { /** * DO NOT use this, for tools only @@ -40,14 +40,14 @@ class SwipeControlsOverlayLayout( private fun getDrawable(name: String, width: Int, height: Int): Drawable { return resources.getDrawable( Utils.getResourceIdentifier(context, name, "drawable"), - context.theme, + context.theme ).apply { setTint(config.overlayForegroundColor) setBounds( 0, 0, width, - height, + height ) } } @@ -59,14 +59,14 @@ class SwipeControlsOverlayLayout( feedbackTextView = TextView(context).apply { layoutParams = LayoutParams( ViewGroup.LayoutParams.WRAP_CONTENT, - ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT ).apply { addRule(CENTER_IN_PARENT, TRUE) setPadding( feedbackTextViewPadding, feedbackTextViewPadding, feedbackTextViewPadding, - feedbackTextViewPadding, + feedbackTextViewPadding ) } background = GradientDrawable().apply { @@ -108,7 +108,7 @@ class SwipeControlsOverlayLayout( icon, null, null, - null, + null ) visibility = VISIBLE } @@ -117,7 +117,7 @@ class SwipeControlsOverlayLayout( override fun onVolumeChanged(newVolume: Int, maximumVolume: Int) { showFeedbackView( "$newVolume", - if (newVolume > 0) normalVolumeIcon else mutedVolumeIcon, + if (newVolume > 0) normalVolumeIcon else mutedVolumeIcon ) } @@ -134,7 +134,7 @@ class SwipeControlsOverlayLayout( @Suppress("DEPRECATION") performHapticFeedback( HapticFeedbackConstants.LONG_PRESS, - HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING, + HapticFeedbackConstants.FLAG_IGNORE_GLOBAL_SETTING ) } }