Skip to content

Commit de120d0

Browse files
MarcaDianMarcaDian
committed
feat(YouTube): Refactor package structure
1 parent d9b5f94 commit de120d0

File tree

101 files changed

+880
-886
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+880
-886
lines changed

‎patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/Fingerprints.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/ads/general/Fingerprints.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.ad.general
1+
package app.revanced.patches.youtube.ads.general
22

33
import app.revanced.patcher.fingerprint
44
import app.revanced.util.containsLiteralInstruction
@@ -22,4 +22,3 @@ internal fun indexOfAddListInstruction(method: Method) =
2222
method.indexOfFirstInstructionReversed {
2323
getReference<MethodReference>()?.name == "add"
2424
}
25-

‎patches/src/main/kotlin/app/revanced/patches/youtube/ad/general/HideAdsPatch.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/ads/general/HideAdsPatch.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.ad.general
1+
package app.revanced.patches.youtube.ads.general
22

33
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
44
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
@@ -11,7 +11,7 @@ import app.revanced.patches.shared.misc.mapping.get
1111
import app.revanced.patches.shared.misc.mapping.resourceMappingPatch
1212
import app.revanced.patches.shared.misc.mapping.resourceMappings
1313
import app.revanced.patches.shared.misc.settings.preference.SwitchPreference
14-
import app.revanced.patches.youtube.ad.getpremium.hideGetPremiumPatch
14+
import app.revanced.patches.youtube.ads.getpremium.hideGetPremiumPatch
1515
import app.revanced.patches.youtube.misc.fix.backtoexitgesture.fixBackToExitGesturePatch
1616
import app.revanced.patches.youtube.misc.litho.filter.addLithoFilter
1717
import app.revanced.patches.youtube.misc.litho.filter.lithoFilterPatch
@@ -40,7 +40,7 @@ private val hideAdsResourcePatch = resourcePatch {
4040
)
4141

4242
execute {
43-
addResources("youtube", "ad.general.hideAdsResourcePatch")
43+
addResources("youtube", "ads.general.hideAdsResourcePatch")
4444

4545
PreferenceScreen.ADS.addPreferences(
4646
SwitchPreference("revanced_hide_general_ads"),

‎patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/Fingerprints.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/Fingerprints.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.ad.getpremium
1+
package app.revanced.patches.youtube.ads.getpremium
22

33
import app.revanced.patcher.fingerprint
44
import com.android.tools.smali.dexlib2.AccessFlags

‎patches/src/main/kotlin/app/revanced/patches/youtube/ad/getpremium/HideGetPremiumPatch.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/ads/getpremium/HideGetPremiumPatch.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.ad.getpremium
1+
package app.revanced.patches.youtube.ads.getpremium
22

33
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
44
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -36,7 +36,7 @@ val hideGetPremiumPatch = bytecodePatch(
3636
)
3737

3838
execute {
39-
addResources("youtube", "ad.getpremium.hideGetPremiumPatch")
39+
addResources("youtube", "ads.getpremium.hideGetPremiumPatch")
4040

4141
PreferenceScreen.ADS.addPreferences(
4242
SwitchPreference("revanced_hide_get_premium"),

‎patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/Fingerprints.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/ads/video/Fingerprints.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.ad.video
1+
package app.revanced.patches.youtube.ads.video
22

33
import app.revanced.patcher.fingerprint
44

‎patches/src/main/kotlin/app/revanced/patches/youtube/ad/video/VideoAdsPatch.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/ads/video/VideoAdsPatch.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.ad.video
1+
package app.revanced.patches.youtube.ads.video
22

33
import app.revanced.patcher.extensions.InstructionExtensions.addInstructionsWithLabels
44
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
@@ -34,7 +34,7 @@ val videoAdsPatch = bytecodePatch(
3434
)
3535

3636
execute {
37-
addResources("youtube", "ad.video.videoAdsPatch")
37+
addResources("youtube", "ads.video.videoAdsPatch")
3838

3939
PreferenceScreen.ADS.addPreferences(
4040
SwitchPreference("revanced_hide_video_ads"),

‎patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/alernativethumbnails/AlternativeThumbnailsPatch.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.layout.thumbnails
1+
package app.revanced.patches.youtube.alernativethumbnails
22

33
import app.revanced.patcher.patch.bytecodePatch
44
import app.revanced.patches.all.misc.resources.addResources
@@ -44,7 +44,7 @@ val alternativeThumbnailsPatch = bytecodePatch(
4444
)
4545

4646
execute {
47-
addResources("youtube", "layout.thumbnails.alternativeThumbnailsPatch")
47+
addResources("youtube", "alernativethumbnails.alternativeThumbnailsPatch")
4848

4949
val entries = "revanced_alt_thumbnail_options_entries"
5050
val values = "revanced_alt_thumbnail_options_entry_values"

‎patches/src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/BypassImageRegionRestrictionsPatch.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/alernativethumbnails/BypassImageRegionRestrictionsPatch.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.layout.thumbnails
1+
package app.revanced.patches.youtube.alernativethumbnails
22

33
import app.revanced.patcher.patch.bytecodePatch
44
import app.revanced.patches.all.misc.resources.addResources
@@ -38,7 +38,7 @@ val bypassImageRegionRestrictionsPatch = bytecodePatch(
3838
)
3939

4040
execute {
41-
addResources("youtube", "layout.thumbnails.bypassImageRegionRestrictionsPatch")
41+
addResources("youtube", "alernativethumbnails.bypassImageRegionRestrictionsPatch")
4242

4343
PreferenceScreen.MISC.addPreferences(
4444
SwitchPreference("revanced_bypass_image_region_restrictions"),

‎patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/Fingerprints.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/feed/hidelayoutcomponents/Fingerprints.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
package app.revanced.patches.youtube.layout.hide.general
1+
package app.revanced.patches.youtube.feed.hidelayoutcomponents
22

33
import app.revanced.patcher.fingerprint
4-
import app.revanced.patches.youtube.layout.searchbar.wideSearchbarLayoutFingerprint
4+
import app.revanced.patches.youtube.feed.searchbar.wideSearchbarLayoutFingerprint
55
import app.revanced.util.literal
66
import com.android.tools.smali.dexlib2.AccessFlags
77
import com.android.tools.smali.dexlib2.Opcode

‎patches/src/main/kotlin/app/revanced/patches/youtube/layout/hide/general/HideLayoutComponentsPatch.kt renamed to ‎patches/src/main/kotlin/app/revanced/patches/youtube/feed/hidelayoutcomponents/HideLayoutComponentsPatch.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package app.revanced.patches.youtube.layout.hide.general
1+
package app.revanced.patches.youtube.feed.hidelayoutcomponents
22

33
import app.revanced.patcher.Fingerprint
44
import app.revanced.patcher.Match
@@ -136,7 +136,7 @@ val hideLayoutComponentsPatch = bytecodePatch(
136136
)
137137

138138
execute {
139-
addResources("youtube", "layout.hide.general.hideLayoutComponentsPatch")
139+
addResources("youtube", "feed.hidelayoutcomponents.hideLayoutComponentsPatch")
140140

141141
PreferenceScreen.PLAYER.addPreferences(
142142
PreferenceScreenPreference(

0 commit comments

Comments
 (0)