diff --git a/src/main/kotlin/app/revanced/patches/music/layout/tabletmode/fingerprints/TabletLayoutFingerprint.kt b/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/fingerprints/TabletIdentifierFingerprint.kt similarity index 86% rename from src/main/kotlin/app/revanced/patches/music/layout/tabletmode/fingerprints/TabletLayoutFingerprint.kt rename to src/main/kotlin/app/revanced/patches/music/layout/landscapemode/fingerprints/TabletIdentifierFingerprint.kt index 25468dd9c..2b118f85c 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/tabletmode/fingerprints/TabletLayoutFingerprint.kt +++ b/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/fingerprints/TabletIdentifierFingerprint.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.tabletmode.fingerprints +package app.revanced.patches.music.layout.landscapemode.fingerprints import app.revanced.patcher.extensions.or import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint @@ -7,7 +7,7 @@ import org.jf.dexlib2.iface.instruction.WideLiteralInstruction import org.jf.dexlib2.AccessFlags import org.jf.dexlib2.Opcode -object TabletLayoutFingerprint : MethodFingerprint( +object TabletIdentifierFingerprint : MethodFingerprint( returnType = "Z", access = AccessFlags.PUBLIC or AccessFlags.STATIC, parameters = listOf("L"), diff --git a/src/main/kotlin/app/revanced/patches/music/layout/tabletmode/patch/TabletModePatch.kt b/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt similarity index 58% rename from src/main/kotlin/app/revanced/patches/music/layout/tabletmode/patch/TabletModePatch.kt rename to src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt index eb133697a..b20bcf5cb 100644 --- a/src/main/kotlin/app/revanced/patches/music/layout/tabletmode/patch/TabletModePatch.kt +++ b/src/main/kotlin/app/revanced/patches/music/layout/landscapemode/patch/LandScapeModePatch.kt @@ -1,4 +1,4 @@ -package app.revanced.patches.music.layout.tabletmode.patch +package app.revanced.patches.music.layout.landscapemode.patch import app.revanced.extensions.toErrorResult import app.revanced.patcher.annotation.Description @@ -11,15 +11,16 @@ import app.revanced.patcher.patch.PatchResult import app.revanced.patcher.patch.PatchResultSuccess import app.revanced.patcher.patch.annotations.DependsOn import app.revanced.patcher.patch.annotations.Patch -import app.revanced.patches.music.layout.tabletmode.fingerprints.TabletLayoutFingerprint +import app.revanced.patches.music.layout.landscapemode.fingerprints.TabletIdentifierFingerprint import app.revanced.patches.music.misc.resourceid.patch.SharedResourceIdPatch -import app.revanced.patches.music.misc.settings.patch.MusicSettingsPatch +import app.revanced.patches.music.misc.settings.resource.patch.MusicSettingsPatch import app.revanced.patches.shared.annotation.YouTubeMusicCompatibility -import app.revanced.util.integrations.Constants.MUSIC_SETTINGS_PATH +import app.revanced.util.enum.CategoryType +import app.revanced.util.integrations.Constants.MUSIC_LAYOUT @Patch -@Name("enable-tablet-mode") -@Description("Enable landscape mode on phone.") +@Name("enable-landscape-mode") +@Description("Enables entry into landscape mode by screen rotation on the phone.") @DependsOn( [ MusicSettingsPatch::class, @@ -28,22 +29,22 @@ import app.revanced.util.integrations.Constants.MUSIC_SETTINGS_PATH ) @YouTubeMusicCompatibility @Version("0.0.1") -class TabletModePatch : BytecodePatch( +class LandScapeModePatch : BytecodePatch( listOf( - TabletLayoutFingerprint + TabletIdentifierFingerprint ) ) { override fun execute(context: BytecodeContext): PatchResult { - TabletLayoutFingerprint.result?.let { + TabletIdentifierFingerprint.result?.let { it.mutableMethod.addInstructions( it.scanResult.patternScanResult!!.endIndex + 1, """ - invoke-static {p0}, $MUSIC_SETTINGS_PATH->enableTabletMode(Z)Z + invoke-static {p0}, $MUSIC_LAYOUT->enableLandScapeMode(Z)Z move-result p0 """ ) - } ?: return TabletLayoutFingerprint.toErrorResult() + } ?: return TabletIdentifierFingerprint.toErrorResult() - MusicSettingsPatch.addMusicPreference("navigation", "revanced_enable_tablet_mode", "true") + MusicSettingsPatch.addMusicPreference(CategoryType.LAYOUT, "revanced_enable_landscape_mode", "true") return PatchResultSuccess() }