fix(YouTube): Patching fails under certain conditions

patches/src/main/kotlin/app/revanced/patches/music/ads/general/AdsPatch.kt

@@ -51,11 +51,11 @@ val adsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         baseAdsPatch("$ADS_PATH/MusicAdsPatch;", "hideMusicAds"),
         lithoFilterPatch,
         navigationBarComponentsPatch, // for 'Hide upgrade button' setting
         sharedResourceIdPatch,
-        settingsPatch,
     )
 
     execute {

patches/src/main/kotlin/app/revanced/patches/music/flyoutmenu/components/FlyoutMenuComponentsPatch.kt

@@ -77,11 +77,11 @@ val flyoutMenuComponentsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         flyoutMenuComponentsResourcePatch,
         flyoutMenuHookPatch,
         lithoFilterPatch,
         sharedResourceIdPatch,
-        settingsPatch,
         versionCheckPatch,
         videoInformationPatch,
         videoTypeHookPatch,

patches/src/main/kotlin/app/revanced/patches/music/general/components/LayoutComponentsPatch.kt

@@ -53,9 +53,9 @@ val layoutComponentsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         lithoFilterPatch,
         sharedResourceIdPatch,
-        settingsPatch,
         settingsMenuPatch,
         versionCheckPatch,
     )

patches/src/main/kotlin/app/revanced/patches/music/misc/share/ShareSheetPatch.kt

@@ -35,8 +35,8 @@ val shareSheetPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
-        lithoFilterPatch,
         settingsPatch,
+        lithoFilterPatch,
         sharedResourceIdPatch
     )
 

patches/src/main/kotlin/app/revanced/patches/music/player/components/PlayerComponentsPatch.kt

@@ -183,9 +183,9 @@ val playerComponentsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         playerComponentsResourcePatch,
         sharedResourceIdPatch,
-        settingsPatch,
         lithoFilterPatch,
         mainActivityResolvePatch,
         videoTypeHookPatch,

patches/src/main/kotlin/app/revanced/patches/youtube/ads/general/AdsPatch.kt

@@ -43,11 +43,11 @@ val adsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         baseAdsPatch(ADS_CLASS_DESCRIPTOR, "hideVideoAds"),
         doubleBackToClosePatch,
         lithoFilterPatch,
         sharedResourceIdPatch,
-        settingsPatch,
         swipeRefreshPatch,
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/general/components/LayoutComponentsPatch.kt

@@ -50,9 +50,9 @@ val layoutComponentsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         lithoFilterPatch,
         sharedResourceIdPatch,
-        settingsPatch,
         settingsMenuPatch,
         viewGroupMarginLayoutParamsHookPatch,
     )

patches/src/main/kotlin/app/revanced/patches/youtube/misc/share/ShareSheetPatch.kt

@@ -36,9 +36,9 @@ val shareSheetPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         lithoFilterPatch,
         sharedResourceIdPatch,
-        settingsPatch,
     )
 
     execute {

patches/src/main/kotlin/app/revanced/patches/youtube/player/action/ActionButtonsPatch.kt

@@ -20,8 +20,8 @@ val actionButtonsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
-        lithoFilterPatch,
         settingsPatch,
+        lithoFilterPatch,
     )
 
     execute {

patches/src/main/kotlin/app/revanced/patches/youtube/player/comments/CommentsComponentPatch.kt

@@ -36,10 +36,10 @@ val commentsComponentPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         inclusiveSpanPatch,
         lithoFilterPatch,
         sharedResourceIdPatch,
-        settingsPatch,
     )
 
     execute {

patches/src/main/kotlin/app/revanced/patches/youtube/player/components/PlayerComponentsPatch.kt

@@ -268,12 +268,12 @@ val playerComponentsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         controlsOverlayConfigPatch,
         inclusiveSpanPatch,
         lithoFilterPatch,
         playerTypeHookPatch,
         sharedResourceIdPatch,
-        settingsPatch,
         speedOverlayPatch,
         suggestedVideoEndScreenPatch,
         videoInformationPatch,

patches/src/main/kotlin/app/revanced/patches/youtube/player/descriptions/DescriptionComponentsPatch.kt

@@ -42,11 +42,11 @@ val descriptionComponentsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         bottomSheetRecyclerViewPatch,
         lithoFilterPatch,
         playerTypeHookPatch,
         sharedResourceIdPatch,
-        settingsPatch,
         versionCheckPatch,
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/player/flyoutmenu/hide/PlayerFlyoutMenuPatch.kt

@@ -43,10 +43,10 @@ val playerFlyoutMenuPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         lithoFilterPatch,
         playerTypeHookPatch,
         sharedResourceIdPatch,
-        settingsPatch,
         versionCheckPatch
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/player/fullscreen/FullscreenComponentsPatch.kt

@@ -55,10 +55,10 @@ val fullscreenComponentsPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         lithoFilterPatch,
         mainActivityResolvePatch,
         sharedResourceIdPatch,
-        settingsPatch,
         versionCheckPatch,
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/shorts/components/ShortsComponentPatch.kt

@@ -537,6 +537,8 @@ val shortsComponentPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
+
         shortsAnimationPatch,
         shortsCustomActionsPatch,
         shortsNavigationBarPatch,
@@ -547,7 +549,6 @@ val shortsComponentPatch = bytecodePatch(
         lithoFilterPatch,
         playerTypeHookPatch,
         sharedResourceIdPatch,
-        settingsPatch,
         textComponentPatch,
         versionCheckPatch,
         videoInformationPatch,

patches/src/main/kotlin/app/revanced/patches/youtube/utils/returnyoutubedislike/ReturnYouTubeDislikePatch.kt

@@ -231,10 +231,10 @@ val returnYouTubeDislikePatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         returnYouTubeDislikeRollingNumberPatch,
         returnYouTubeDislikeShortsPatch,
         lithoFilterPatch,
-        settingsPatch,
         videoInformationPatch,
     )
 

patches/src/main/kotlin/app/revanced/patches/youtube/video/playback/VideoPlaybackPatch.kt

@@ -79,6 +79,7 @@ val videoPlaybackPatch = bytecodePatch(
     compatibleWith(COMPATIBLE_PACKAGE)
 
     dependsOn(
+        settingsPatch,
         bottomSheetRecyclerViewPatch,
         customPlaybackSpeedPatch(
             "$VIDEO_PATH/CustomPlaybackSpeedPatch;",
@@ -87,7 +88,6 @@ val videoPlaybackPatch = bytecodePatch(
         flyoutMenuHookPatch,
         lithoFilterPatch,
         playerTypeHookPatch,
-        settingsPatch,
         shortsPlaybackPatch,
         videoIdPatch,
         videoInformationPatch,