feat(music/settings): create Video category

This commit is contained in:
inotia00 2023-09-18 00:51:46 +09:00
parent 37d416735a
commit 153dec8fb9
12 changed files with 27 additions and 22 deletions

View File

@ -9,7 +9,7 @@ object PlaybackSpeedPatchFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
parameters = listOf("F"),
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/music/patches/misc/PlaybackSpeedPatch;"
methodDef.definingClass == "Lapp/revanced/music/patches/video/PlaybackSpeedPatch;"
&& methodDef.name == "overrideSpeed"
}
)

View File

@ -14,7 +14,7 @@ import app.revanced.patches.music.utils.overridespeed.fingerprints.PlaybackSpeed
import app.revanced.patches.music.utils.overridespeed.fingerprints.PlaybackSpeedParentFingerprint
import app.revanced.patches.music.utils.overridespeed.fingerprints.PlaybackSpeedPatchFingerprint
import app.revanced.util.integrations.Constants.MUSIC_INTEGRATIONS_PATH
import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
import app.revanced.util.integrations.Constants.MUSIC_VIDEO_PATH
import com.android.tools.smali.dexlib2.AccessFlags
import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction35c
import com.android.tools.smali.dexlib2.dexbacked.reference.DexBackedMethodReference
@ -103,7 +103,7 @@ class OverrideSpeedHookPatch : BytecodePatch(
internal companion object {
const val INTEGRATIONS_PLAYBACK_SPEED_CLASS_DESCRIPTOR =
"$MUSIC_MISC_PATH/PlaybackSpeedPatch;"
"$MUSIC_VIDEO_PATH/PlaybackSpeedPatch;"
const val INTEGRATIONS_VIDEO_HELPER_CLASS_DESCRIPTOR =
"$MUSIC_INTEGRATIONS_PATH/utils/VideoHelpers;"

View File

@ -1,4 +1,4 @@
package app.revanced.patches.music.misc.quality.fingerprints
package app.revanced.patches.music.video.quality.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

View File

@ -1,4 +1,4 @@
package app.revanced.patches.music.misc.quality.fingerprints
package app.revanced.patches.music.video.quality.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

View File

@ -1,4 +1,4 @@
package app.revanced.patches.music.misc.quality.fingerprints
package app.revanced.patches.music.video.quality.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import com.android.tools.smali.dexlib2.Opcode

View File

@ -1,4 +1,4 @@
package app.revanced.patches.music.misc.quality.patch
package app.revanced.patches.music.video.quality.patch
import app.revanced.extensions.exception
import app.revanced.extensions.findMutableMethodOf
@ -12,15 +12,15 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.music.misc.quality.fingerprints.MusicVideoQualitySettingsFingerprint
import app.revanced.patches.music.misc.quality.fingerprints.MusicVideoQualitySettingsParentFingerprint
import app.revanced.patches.music.misc.quality.fingerprints.UserQualityChangeFingerprint
import app.revanced.patches.music.utils.annotations.MusicCompatibility
import app.revanced.patches.music.utils.resourceid.patch.SharedResourceIdPatch
import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
import app.revanced.patches.music.video.information.patch.VideoInformationPatch
import app.revanced.patches.music.video.quality.fingerprints.MusicVideoQualitySettingsFingerprint
import app.revanced.patches.music.video.quality.fingerprints.MusicVideoQualitySettingsParentFingerprint
import app.revanced.patches.music.video.quality.fingerprints.UserQualityChangeFingerprint
import app.revanced.util.enum.CategoryType
import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
import app.revanced.util.integrations.Constants.MUSIC_VIDEO_PATH
import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21c
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
@ -113,8 +113,9 @@ class VideoQualityPatch : BytecodePatch(
} ?: throw MusicVideoQualitySettingsParentFingerprint.exception
VideoInformationPatch.injectCall("$INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR->newVideoStarted(Ljava/lang/String;)V")
SettingsPatch.addMusicPreference(
CategoryType.MISC,
CategoryType.VIDEO,
"revanced_enable_save_video_quality",
"true"
)
@ -123,7 +124,7 @@ class VideoQualityPatch : BytecodePatch(
private companion object {
const val INTEGRATIONS_VIDEO_QUALITY_CLASS_DESCRIPTOR =
"$MUSIC_MISC_PATH/VideoQualityPatch;"
"$MUSIC_VIDEO_PATH/VideoQualityPatch;"
private lateinit var qIndexMethodName: String
private lateinit var qualityReference: Reference

View File

@ -1,4 +1,4 @@
package app.revanced.patches.music.misc.speed.fingerprints
package app.revanced.patches.music.video.speed.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

View File

@ -1,4 +1,4 @@
package app.revanced.patches.music.misc.speed.fingerprints
package app.revanced.patches.music.video.speed.fingerprints
import app.revanced.patcher.extensions.or
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint

View File

@ -1,4 +1,4 @@
package app.revanced.patches.music.misc.speed.patch
package app.revanced.patches.music.video.speed.patch
import app.revanced.extensions.exception
import app.revanced.patcher.annotation.Description
@ -10,13 +10,13 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint.Companion.
import app.revanced.patcher.patch.BytecodePatch
import app.revanced.patcher.patch.annotations.DependsOn
import app.revanced.patcher.patch.annotations.Patch
import app.revanced.patches.music.misc.speed.fingerprints.PlaybackSpeedBottomSheetFingerprint
import app.revanced.patches.music.misc.speed.fingerprints.PlaybackSpeedBottomSheetParentFingerprint
import app.revanced.patches.music.utils.annotations.MusicCompatibility
import app.revanced.patches.music.utils.overridespeed.patch.OverrideSpeedHookPatch
import app.revanced.patches.music.utils.settings.resource.patch.SettingsPatch
import app.revanced.patches.music.video.speed.fingerprints.PlaybackSpeedBottomSheetFingerprint
import app.revanced.patches.music.video.speed.fingerprints.PlaybackSpeedBottomSheetParentFingerprint
import app.revanced.util.enum.CategoryType
import app.revanced.util.integrations.Constants.MUSIC_MISC_PATH
import app.revanced.util.integrations.Constants.MUSIC_VIDEO_PATH
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@Patch
@ -55,7 +55,7 @@ class PlaybackSpeedPatch : BytecodePatch(
} ?: throw PlaybackSpeedBottomSheetParentFingerprint.exception
SettingsPatch.addMusicPreference(
CategoryType.MISC,
CategoryType.VIDEO,
"revanced_enable_save_playback_speed",
"false"
)
@ -64,6 +64,6 @@ class PlaybackSpeedPatch : BytecodePatch(
private companion object {
const val INTEGRATIONS_CLASS_DESCRIPTOR =
"$MUSIC_MISC_PATH/PlaybackSpeedPatch;"
"$MUSIC_VIDEO_PATH/PlaybackSpeedPatch;"
}
}

View File

@ -7,5 +7,6 @@ internal enum class CategoryType(val value: String, var added: Boolean) {
GENERAL("general", false),
MISC("misc", false),
NAVIGATION("navigation", false),
PLAYER("player", false)
PLAYER("player", false),
VIDEO("video", false)
}

View File

@ -28,5 +28,7 @@ internal object Constants {
const val MUSIC_MISC_PATH = "$MUSIC_PATCHES_PATH/misc"
const val MUSIC_NAVIGATION = "$MUSIC_PATCHES_PATH/navigation/NavigationPatch;"
const val MUSIC_PLAYER = "$MUSIC_PATCHES_PATH/player/PlayerPatch;"
const val MUSIC_VIDEO_PATH = "$MUSIC_PATCHES_PATH/video"
const val MUSIC_UTILS_PATH = "$MUSIC_PATCHES_PATH/utils"
}

View File

@ -7,6 +7,7 @@
<string name="revanced_category_misc">Miscellaneous</string>
<string name="revanced_category_navigation">Navigation</string>
<string name="revanced_category_player">Player</string>
<string name="revanced_category_video">Video</string>
<string name="revanced_custom_filter_strings_summary">Filter component names by line-seperated</string>
<string name="revanced_custom_filter_strings_title">Edit custom filter</string>
<string name="revanced_custom_filter_summary">Enables custom filters</string>