ReVanced/revanced-patches-ex
1
0
Fork 0
mirror of https://github.com/inotia00/revanced-patches.git synced 2025-05-21 00:37:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat(YouTube/Enable tablet mini player): add Hide rewind and forward button settings

Browse Source
This commit is contained in:
inotia00 2024-04-29 23:40:12 +09:00
parent 8417398042
commit df5b0c271b
6 changed files with 67 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/app/revanced/patches/youtube/general/tabletminiplayer/TabletMiniPlayerPatch.kt
View File

@ -14,6 +14,8 @@ import app.revanced.patches.youtube.general.tabletminiplayer.fingerprints.Modern
import app.revanced.patches.youtube.utils.integrations.Constants.COMPATIBLE_PACKAGE
import app.revanced.patches.youtube.utils.integrations.Constants.GENERAL_CLASS_DESCRIPTOR
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.ModernMiniPlayerForwardButton
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.ModernMiniPlayerRewindButton
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.YtOutlinePiPWhite
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.YtOutlineXWhite
import app.revanced.patches.youtube.utils.settings.SettingsPatch
@ -25,6 +27,7 @@ import app.revanced.util.getTargetIndexReversed
import app.revanced.util.getWalkerMethod
import app.revanced.util.indexOfFirstInstruction
import app.revanced.util.literalInstructionHook
import app.revanced.util.literalInstructionViewHook
import app.revanced.util.patch.BaseBytecodePatch
import app.revanced.util.resultOrThrow
import com.android.tools.smali.dexlib2.Opcode
@ -93,6 +96,17 @@ object TabletMiniPlayerPatch : BaseBytecodePatch(
context.literalInstructionHook(literal, smaliInstruction)
}
arrayOf(
ModernMiniPlayerForwardButton,
ModernMiniPlayerRewindButton
).forEach { literal ->
val smaliInstruction = """
invoke-static {v$REGISTER_TEMPLATE_REPLACEMENT}, $GENERAL_CLASS_DESCRIPTOR->hideRewindAndForwardButton(Landroid/view/View;)V
"""
context.literalInstructionViewHook(literal, smaliInstruction)
}
SettingsPatch.addPreference(
arrayOf(
"SETTINGS: ENABLE_MODERN_MINI_PLAYER"

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

@ -13,8 +13,9 @@ import app.revanced.patches.youtube.utils.playertype.PlayerTypeHookPatch
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch
import app.revanced.patches.youtube.utils.resourceid.SharedResourceIdPatch.BottomSheetFooterText
import app.revanced.patches.youtube.utils.settings.SettingsPatch
import app.revanced.util.REGISTER_TEMPLATE_REPLACEMENT
import app.revanced.util.literalInstructionBooleanHook
import app.revanced.util.literalInstructionHook
import app.revanced.util.literalInstructionViewHook
import app.revanced.util.patch.BaseBytecodePatch
@Suppress("unused")
@ -45,7 +46,10 @@ object PlayerFlyoutMenuPatch : BaseBytecodePatch(
CaptionsBottomSheetFingerprint to "hideFooterCaptions",
QualityMenuViewInflateFingerprint to "hideFooterQuality"
).map { (fingerprint, name) ->
fingerprint.literalInstructionHook(BottomSheetFooterText, "$PLAYER_CLASS_DESCRIPTOR->$name(Landroid/view/View;)V")
val smaliInstruction = """
invoke-static {v$REGISTER_TEMPLATE_REPLACEMENT}, $PLAYER_CLASS_DESCRIPTOR->$name(Landroid/view/View;)V
"""
fingerprint.literalInstructionViewHook(BottomSheetFooterText, smaliInstruction)
}
LithoFilterPatch.addFilter(PANELS_FILTER_CLASS_DESCRIPTOR)

4
src/main/kotlin/app/revanced/patches/youtube/utils/resourceid/SharedResourceIdPatch.kt
View File

@ -63,6 +63,8 @@ object SharedResourceIdPatch : ResourcePatch() {
var InsetOverlayViewLayout = -1L
var InterstitialsContainer = -1L
var MenuItemView = -1L
var ModernMiniPlayerForwardButton = -1L
var ModernMiniPlayerRewindButton = -1L
var MusicAppDeeplinkButtonView = -1L
var PanelSubHeader = -1L
var PlayerCollapseButton = -1L
@ -147,6 +149,8 @@ object SharedResourceIdPatch : ResourcePatch() {
InsetOverlayViewLayout = getId(ID, "inset_overlay_view_layout")
InterstitialsContainer = getId(ID, "interstitials_container")
MenuItemView = getId(ID, "menu_item_view")
ModernMiniPlayerForwardButton = getId(ID, "modern_miniplayer_forward_button")
ModernMiniPlayerRewindButton = getId(ID, "modern_miniplayer_rewind_button")
MusicAppDeeplinkButtonView = getId(ID, "music_app_deeplink_button_view")
PanelSubHeader = getId(ID, "panel_subheader")
PlayerCollapseButton = getId(ID, "player_collapse_button")

49
src/main/kotlin/app/revanced/util/BytecodeUtils.kt
View File

@ -139,19 +139,46 @@ fun MethodFingerprint.literalInstructionBooleanHook(
}
}
fun MethodFingerprint.literalInstructionHook(
fun MethodFingerprint.literalInstructionViewHook(
literal: Long,
descriptor: String
) {
resultOrThrow().mutableMethod.apply {
val literalIndex = getWideLiteralInstructionIndex(literal)
val targetIndex = getTargetIndex(literalIndex, Opcode.MOVE_RESULT_OBJECT)
val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA
smaliInstruction: String
) = resultOrThrow().mutableMethod.literalInstructionViewHook(literal, smaliInstruction)
addInstruction(
targetIndex + 1,
"invoke-static {v$targetRegister}, $descriptor"
)
fun MutableMethod.literalInstructionViewHook(
literal: Long,
smaliInstruction: String
) {
val literalIndex = getWideLiteralInstructionIndex(literal)
val targetIndex = getTargetIndex(literalIndex, Opcode.MOVE_RESULT_OBJECT)
val targetRegister = getInstruction<OneRegisterInstruction>(targetIndex).registerA.toString()
addInstructions(
targetIndex + 1,
smaliInstruction.replace(REGISTER_TEMPLATE_REPLACEMENT, targetRegister)
)
}
fun BytecodeContext.literalInstructionViewHook(
literal: Long,
smaliInstruction: String
) {
val context = this
context.classes.forEach { classDef ->
classDef.methods.forEach { method ->
method.implementation.apply {
this?.instructions?.forEachIndexed { _, instruction ->
if (instruction.opcode != Opcode.CONST)
return@forEachIndexed
if ((instruction as Instruction31i).wideLiteral != literal)
return@forEachIndexed
context.proxy(classDef)
.mutableClass
.findMutableMethodOf(method)
.literalInstructionViewHook(literal, smaliInstruction)
}
}
}
}
}

3
src/main/resources/youtube/settings/host/values/strings.xml
View File

@ -280,6 +280,9 @@ Limitations:
<string name="revanced_enable_modern_mini_player_title">Enable modern mini player</string>
<string name="revanced_enable_modern_mini_player_summary_on">Modern mini player is enabled.</string>
<string name="revanced_enable_modern_mini_player_summary_off">Modern mini player is disabled.</string>
<string name="revanced_hide_mini_player_rewind_forward_button_title">Hide rewind &amp; forward button</string>
<string name="revanced_hide_mini_player_rewind_forward_button_summary_on">Buttons are hidden in mini player.</string>
<string name="revanced_hide_mini_player_rewind_forward_button_summary_off">Buttons are shown in mini player.</string>
<string name="revanced_hide_floating_microphone_title">Hide floating microphone button</string>
<string name="revanced_hide_floating_microphone_summary_on">Floating microphone button is hidden.</string>

3
src/main/resources/youtube/settings/xml/revanced_prefs.xml
View File

@ -172,7 +172,8 @@
<!-- SETTINGS: ENABLE_TABLET_MINI_PLAYER
<SwitchPreference android:title="@string/revanced_enable_tablet_mini_player_title" android:key="revanced_enable_tablet_mini_player" android:defaultValue="false" android:summaryOn="@string/revanced_enable_tablet_mini_player_summary_on" android:summaryOff="@string/revanced_enable_tablet_mini_player_summary_off" />SETTINGS: ENABLE_TABLET_MINI_PLAYER -->
<!-- SETTINGS: ENABLE_MODERN_MINI_PLAYER
<SwitchPreference android:title="@string/revanced_enable_modern_mini_player_title" android:key="revanced_enable_modern_mini_player" android:defaultValue="false" android:summaryOn="@string/revanced_enable_modern_mini_player_summary_on" android:summaryOff="@string/revanced_enable_modern_mini_player_summary_off" />SETTINGS: ENABLE_MODERN_MINI_PLAYER -->
<SwitchPreference android:title="@string/revanced_enable_modern_mini_player_title" android:key="revanced_enable_modern_mini_player" android:defaultValue="false" android:summaryOn="@string/revanced_enable_modern_mini_player_summary_on" android:summaryOff="@string/revanced_enable_modern_mini_player_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_mini_player_rewind_forward_button_title" android:key="revanced_hide_mini_player_rewind_forward_button" android:defaultValue="false" android:summaryOn="@string/revanced_hide_mini_player_rewind_forward_button_summary_on" android:summaryOff="@string/revanced_hide_mini_player_rewind_forward_button_summary_off" />SETTINGS: ENABLE_MODERN_MINI_PLAYER -->
<!-- SETTINGS: HIDE_LAYOUT_COMPONENTS
<SwitchPreference android:title="@string/revanced_hide_floating_microphone_title" android:key="revanced_hide_floating_microphone" android:defaultValue="true" android:summaryOn="@string/revanced_hide_floating_microphone_summary_on" android:summaryOff="@string/revanced_hide_floating_microphone_summary_off" />