diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/flyout/FlyoutPatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/flyout/FlyoutPatch.java index 71ae52a34..be5106d04 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/flyout/FlyoutPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/flyout/FlyoutPatch.java @@ -108,13 +108,13 @@ public class FlyoutPatch { if (REPLACE_FLYOUT_MENU_DISMISS_QUEUE.get() && textView.getParent() instanceof ViewGroup clickAbleArea) { runOnMainThreadDelayed(() -> { - textView.setText(str("revanced_replace_flyout_menu_dismiss_queue_watch_on_youtube_label")); - imageView.setImageResource(getIdentifier("yt_outline_youtube_logo_icon_vd_theme_24", ResourceType.DRAWABLE, clickAbleArea.getContext())); - clickAbleArea.setOnClickListener(view -> { - clickView(touchOutSideViewRef.get()); - VideoUtils.openInYouTube(); - }); - }, 0L + textView.setText(str("revanced_replace_flyout_menu_dismiss_queue_watch_on_youtube_label")); + imageView.setImageResource(getIdentifier("yt_outline_youtube_logo_icon_vd_theme_24", ResourceType.DRAWABLE, clickAbleArea.getContext())); + clickAbleArea.setOnClickListener(view -> { + clickView(touchOutSideViewRef.get()); + VideoUtils.openInYouTube(); + }); + }, 0L ); } } @@ -126,14 +126,14 @@ public class FlyoutPatch { textView.getParent() instanceof ViewGroup clickAbleArea ) { runOnMainThreadDelayed(() -> { - textView.setText(str("playback_rate_title")); - imageView.setImageResource(getIdentifier("yt_outline_play_arrow_half_circle_black_24", ResourceType.DRAWABLE, clickAbleArea.getContext())); - imageView.setColorFilter(cf); - clickAbleArea.setOnClickListener(view -> { - clickView(touchOutSideViewRef.get()); - VideoUtils.showPlaybackSpeedFlyoutMenu(); - }); - }, 0L + textView.setText(str("playback_rate_title")); + imageView.setImageResource(getIdentifier("yt_outline_play_arrow_half_circle_black_24", ResourceType.DRAWABLE, clickAbleArea.getContext())); + imageView.setColorFilter(cf); + clickAbleArea.setOnClickListener(view -> { + clickView(touchOutSideViewRef.get()); + VideoUtils.showPlaybackSpeedFlyoutMenu(); + }); + }, 0L ); } } diff --git a/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/SpoofPlayerParameterPatch.java b/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/SpoofPlayerParameterPatch.java index d5e5b014b..23082f50e 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/SpoofPlayerParameterPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/music/patches/misc/SpoofPlayerParameterPatch.java @@ -9,7 +9,6 @@ import androidx.annotation.Nullable; import org.apache.commons.lang3.BooleanUtils; -import java.util.Arrays; import java.util.LinkedHashMap; import java.util.Map; diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/FullscreenAdsPatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/FullscreenAdsPatch.java index e60a4ddf0..75711fe23 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/FullscreenAdsPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/FullscreenAdsPatch.java @@ -37,7 +37,7 @@ public class FullscreenAdsPatch { * Therefore, make sure that the dialog contains the ads at the beginning of the Method * * @param bytes proto buffer array - * @param type dialog type (similar to {@link Enum#ordinal()}) + * @param type dialog type (similar to {@link Enum#ordinal()}) */ public static void checkDialog(byte[] bytes, int type) { if (!HIDE_FULLSCREEN_ADS) { diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/ReturnYouTubeUsernamePatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/ReturnYouTubeUsernamePatch.java index 20c987db3..a3625e834 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/ReturnYouTubeUsernamePatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/ReturnYouTubeUsernamePatch.java @@ -2,7 +2,6 @@ package app.revanced.extension.shared.patches; import static java.lang.Boolean.FALSE; import static java.lang.Boolean.TRUE; - import static app.revanced.extension.shared.utils.Utils.newSpanUsingStylingOfAnotherSpan; import androidx.annotation.NonNull; diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/WatchHistoryPatch.java b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/WatchHistoryPatch.java index 46e3d1cf9..4d37cde1e 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/patches/WatchHistoryPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/patches/WatchHistoryPatch.java @@ -2,8 +2,8 @@ package app.revanced.extension.shared.patches; import android.net.Uri; -import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.settings.BaseSettings; +import app.revanced.extension.shared.utils.Logger; @SuppressWarnings("unused") public final class WatchHistoryPatch { diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java index fead7fcc8..9834cc5f0 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/settings/preference/AbstractPreferenceFragment.java @@ -149,7 +149,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment { * Updates all Preferences values and their availability using the current values in {@link Setting}. */ protected void updateUIToSettingValues() { - updatePreferenceScreen(getPreferenceScreen(), true,true); + updatePreferenceScreen(getPreferenceScreen(), true, true); } /** @@ -246,7 +246,7 @@ public abstract class AbstractPreferenceFragment extends PreferenceFragment { /** * Updates a UI Preference with the {@link Setting} that backs it. * - * @param syncSetting If the UI should be synced {@link Setting} <-> Preference + * @param syncSetting If the UI should be synced {@link Setting} <-> Preference * @param applySettingToPreference If true, then apply {@link Setting} -> Preference. * If false, then apply {@link Setting} <- Preference. */ diff --git a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java index 268a9e0be..bbad47a50 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java +++ b/extensions/shared/src/main/java/app/revanced/extension/shared/utils/Utils.java @@ -608,10 +608,10 @@ public class Utils { *
* Be aware the on start action can be called multiple times for some situations, * such as the user switching apps without dismissing the dialog then switching back to this app. - *
+ *
* This method is only useful during app startup and multiple patches may show their own dialog, * and the most important dialog can be called last (using a delay) so it's always on top. - *
+ *
* For all other situations it's better to not use this method and * call {@link AlertDialog#show()} on the dialog. */ diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ActionButtonsFilter.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ActionButtonsFilter.java index 680846c13..eace3d445 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ActionButtonsFilter.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ActionButtonsFilter.java @@ -6,7 +6,6 @@ import app.revanced.extension.shared.patches.components.ByteArrayFilterGroup; import app.revanced.extension.shared.patches.components.ByteArrayFilterGroupList; import app.revanced.extension.shared.patches.components.Filter; import app.revanced.extension.shared.patches.components.StringFilterGroup; -import app.revanced.extension.shared.settings.BooleanSetting; import app.revanced.extension.youtube.settings.Settings; @SuppressWarnings("unused") diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/ChangeStartPagePatch.kt b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/ChangeStartPagePatch.kt index 5625e07d3..9284d8a62 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/ChangeStartPagePatch.kt +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/ChangeStartPagePatch.kt @@ -6,7 +6,6 @@ import app.revanced.extension.shared.settings.Setting.Availability import app.revanced.extension.shared.utils.Logger import app.revanced.extension.youtube.settings.Settings import org.apache.commons.lang3.StringUtils -import kotlin.Boolean @Suppress("unused") object ChangeStartPagePatch { @@ -44,7 +43,7 @@ object ChangeStartPagePatch { } appLaunched = true - Logger.printDebug{ "Changing browseId to $browseId" } + Logger.printDebug { "Changing browseId to $browseId" } return browseId } diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/DownloadActionsPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/DownloadActionsPatch.java index ba818a3c8..d3fd2c399 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/DownloadActionsPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/DownloadActionsPatch.java @@ -39,7 +39,7 @@ public final class DownloadActionsPatch { *

* Appears to always be called from the main thread. */ - public static boolean inAppVideoDownloadButtonOnClick(@Nullable Map map,Object offlineVideoEndpointOuterClass, + public static boolean inAppVideoDownloadButtonOnClick(@Nullable Map map, Object offlineVideoEndpointOuterClass, @Nullable String videoId) { try { if (OVERRIDE_VIDEO_DOWNLOAD_BUTTON && StringUtils.isNotEmpty(videoId)) { diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java index 020012d82..2c3c87989 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/GeneralPatch.java @@ -119,9 +119,9 @@ public class GeneralPatch { Settings.DISABLE_LAYOUT_UPDATES.get(); /** - * @param key Keys to be added to the header of CronetBuilder. - * @param value Values to be added to the header of CronetBuilder. - * @return Empty value if setting is enabled. + * @param key Keys to be added to the header of CronetBuilder. + * @param value Values to be added to the header of CronetBuilder. + * @return Empty value if setting is enabled. */ public static String disableLayoutUpdates(String key, String value) { if (DISABLE_LAYOUT_UPDATES && StringUtils.equalsAny(key, REQUEST_HEADER_KEYS)) { diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/OpenChannelOfLiveAvatarPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/OpenChannelOfLiveAvatarPatch.java index 489ac1cae..e3177dd60 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/OpenChannelOfLiveAvatarPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/general/OpenChannelOfLiveAvatarPatch.java @@ -43,8 +43,8 @@ public final class OpenChannelOfLiveAvatarPatch { /** * Injection point. * - * @param playbackStartDescriptorMap map containing information about PlaybackStartDescriptor - * @param newlyLoadedVideoId id of the current video + * @param playbackStartDescriptorMap map containing information about PlaybackStartDescriptor + * @param newlyLoadedVideoId id of the current video */ public static void fetchChannelId(@NonNull Map playbackStartDescriptorMap, String newlyLoadedVideoId) { try { diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/misc/BackgroundPlaybackPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/misc/BackgroundPlaybackPatch.java index e6172078d..4223b6a26 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/misc/BackgroundPlaybackPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/misc/BackgroundPlaybackPatch.java @@ -2,7 +2,6 @@ package app.revanced.extension.youtube.patches.misc; import app.revanced.extension.shared.settings.BooleanSetting; import app.revanced.extension.youtube.settings.Settings; -import app.revanced.extension.youtube.shared.PlayerType; import app.revanced.extension.youtube.shared.ShortsPlayerState; @SuppressWarnings("unused") diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/ActionButtonsPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/ActionButtonsPatch.java index f3207ae8f..279c62c67 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/ActionButtonsPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/ActionButtonsPatch.java @@ -1,5 +1,7 @@ package app.revanced.extension.youtube.patches.player; +import static app.revanced.extension.youtube.patches.player.ActionButtonsPatch.ActionButton.REMIX; + import androidx.annotation.Nullable; import org.apache.commons.lang3.ArrayUtils; @@ -8,8 +10,6 @@ import java.util.Arrays; import java.util.List; import java.util.Map; -import static app.revanced.extension.youtube.patches.player.ActionButtonsPatch.ActionButton.*; - import app.revanced.extension.shared.settings.BooleanSetting; import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.utils.Utils; @@ -106,8 +106,8 @@ public class ActionButtonsPatch { /** * Injection point. * - * @param list Type list of litho components - * @param identifier Identifier of litho components + * @param list Type list of litho components + * @param identifier Identifier of litho components */ public static List hideActionButtonByIndex(@Nullable List list, @Nullable String identifier) { try { diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java index ef1bf3800..992bebdf9 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/PlayerPatch.java @@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import app.revanced.extension.shared.settings.BaseSettings; import app.revanced.extension.shared.settings.BooleanSetting; import app.revanced.extension.shared.settings.IntegerSetting; -import app.revanced.extension.shared.settings.StringSetting; import app.revanced.extension.shared.utils.Logger; import app.revanced.extension.shared.utils.ResourceUtils; import app.revanced.extension.shared.utils.Utils; @@ -471,8 +470,8 @@ public class PlayerPatch { * Used in YouTube 20.05.46+. */ public static void disableAutoPlayerPopupPanels(@NonNull String newlyLoadedChannelId, @NonNull String newlyLoadedChannelName, - @NonNull String newlyLoadedVideoId, @NonNull String newlyLoadedVideoTitle, - final long newlyLoadedVideoLength, boolean newlyLoadedLiveStreamValue) { + @NonNull String newlyLoadedVideoId, @NonNull String newlyLoadedVideoTitle, + final long newlyLoadedVideoLength, boolean newlyLoadedLiveStreamValue) { if (Settings.DISABLE_AUTO_PLAYER_POPUP_PANELS.get() && newVideoStarted.compareAndSet(false, true)) { Utils.runOnMainThreadDelayed(() -> newVideoStarted.compareAndSet(true, false), 3000L); } diff --git a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/SeekbarColorPatch.java b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/SeekbarColorPatch.java index 8b3b99528..0975a9b6e 100644 --- a/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/SeekbarColorPatch.java +++ b/extensions/shared/src/main/java/app/revanced/extension/youtube/patches/player/SeekbarColorPatch.java @@ -47,7 +47,7 @@ public class SeekbarColorPatch { /** * Empty seekbar gradient, if hide seekbar in feed is enabled. */ - private static final int[] HIDDEN_SEEKBAR_GRADIENT_COLORS = { 0x0, 0x0 }; + private static final int[] HIDDEN_SEEKBAR_GRADIENT_COLORS = {0x0, 0x0}; /** * Default YouTube seekbar color brightness.