This commit is contained in:
inotia00 2023-09-18 00:57:18 +09:00
parent 153dec8fb9
commit 0e2b2a9ce2
4 changed files with 29 additions and 9 deletions

View File

@ -130,10 +130,19 @@ class SettingsPatch : AbstractSettingsResourcePatch(
category: CategoryType, category: CategoryType,
key: String, key: String,
defaultValue: String defaultValue: String
) {
addMusicPreference(category, key, defaultValue, "")
}
internal fun addMusicPreference(
category: CategoryType,
key: String,
defaultValue: String,
dependencyKey: String
) { ) {
val categoryValue = category.value val categoryValue = category.value
contexts.addMusicPreferenceCategory(categoryValue) contexts.addMusicPreferenceCategory(categoryValue)
contexts.addMusicPreference(categoryValue, key, defaultValue) contexts.addMusicPreference(categoryValue, key, defaultValue, dependencyKey)
} }
internal fun addMusicPreferenceWithoutSummary( internal fun addMusicPreferenceWithoutSummary(
@ -146,6 +155,13 @@ class SettingsPatch : AbstractSettingsResourcePatch(
contexts.addMusicPreferenceWithoutSummary(categoryValue, key, defaultValue) contexts.addMusicPreferenceWithoutSummary(categoryValue, key, defaultValue)
} }
internal fun addMusicPreferenceWithIntent(
category: CategoryType,
key: String
) {
addMusicPreferenceWithIntent(category, key, "")
}
internal fun addMusicPreferenceWithIntent( internal fun addMusicPreferenceWithIntent(
category: CategoryType, category: CategoryType,
key: String, key: String,

View File

@ -14,7 +14,6 @@ import app.revanced.patches.music.utils.sponsorblock.bytecode.fingerprints.Music
import app.revanced.patches.music.utils.sponsorblock.bytecode.fingerprints.MusicPlaybackControlsTimeBarOnMeasureFingerprint import app.revanced.patches.music.utils.sponsorblock.bytecode.fingerprints.MusicPlaybackControlsTimeBarOnMeasureFingerprint
import app.revanced.patches.music.utils.sponsorblock.bytecode.fingerprints.SeekbarOnDrawFingerprint import app.revanced.patches.music.utils.sponsorblock.bytecode.fingerprints.SeekbarOnDrawFingerprint
import app.revanced.patches.music.video.information.patch.VideoInformationPatch import app.revanced.patches.music.video.information.patch.VideoInformationPatch
import app.revanced.patches.music.utils.videoinformation.patch.VideoInformationPatch
import com.android.tools.smali.dexlib2.Opcode import com.android.tools.smali.dexlib2.Opcode
import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction3rc import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction3rc
import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction import com.android.tools.smali.dexlib2.iface.instruction.FiveRegisterInstruction
@ -26,7 +25,6 @@ import com.android.tools.smali.dexlib2.iface.reference.MethodReference
@DependsOn( @DependsOn(
[ [
SharedResourceIdPatch::class, SharedResourceIdPatch::class,
VideoInformationPatch::class,
VideoInformationPatch::class VideoInformationPatch::class
] ]
) )

View File

@ -110,7 +110,8 @@ internal object MusicResourceHelper {
internal fun ResourceContext.addMusicPreference( internal fun ResourceContext.addMusicPreference(
category: String, category: String,
key: String, key: String,
defaultValue: String defaultValue: String,
dependencyKey: String
) { ) {
this.xmlEditor[YOUTUBE_MUSIC_SETTINGS_PATH].use { editor -> this.xmlEditor[YOUTUBE_MUSIC_SETTINGS_PATH].use { editor ->
val tags = editor.file.getElementsByTagName(YOUTUBE_MUSIC_PREFERENCE_SCREEN_TAG_NAME) val tags = editor.file.getElementsByTagName(YOUTUBE_MUSIC_PREFERENCE_SCREEN_TAG_NAME)
@ -122,6 +123,9 @@ internal object MusicResourceHelper {
setAttribute("android:summary", "@string/$key" + "_summary") setAttribute("android:summary", "@string/$key" + "_summary")
setAttribute("android:key", key) setAttribute("android:key", key)
setAttribute("android:defaultValue", defaultValue) setAttribute("android:defaultValue", defaultValue)
if (dependencyKey != "") {
setAttribute("android:dependency", dependencyKey)
}
} }
} }
} }
@ -141,7 +145,9 @@ internal object MusicResourceHelper {
setAttribute("android:title", "@string/$key" + "_title") setAttribute("android:title", "@string/$key" + "_title")
setAttribute("android:summary", "@string/$key" + "_summary") setAttribute("android:summary", "@string/$key" + "_summary")
setAttribute("android:key", key) setAttribute("android:key", key)
setAttribute("android:dependency", dependencyKey) if (dependencyKey != "") {
setAttribute("android:dependency", dependencyKey)
}
this.adoptChild("intent") { this.adoptChild("intent") {
setAttribute("android:targetPackage", targetPackage) setAttribute("android:targetPackage", targetPackage)
setAttribute("android:data", key) setAttribute("android:data", key)

View File

@ -8,9 +8,9 @@
<string name="revanced_category_navigation">Navigation</string> <string name="revanced_category_navigation">Navigation</string>
<string name="revanced_category_player">Player</string> <string name="revanced_category_player">Player</string>
<string name="revanced_category_video">Video</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_summary">Filter component names by line-seperated.</string>
<string name="revanced_custom_filter_strings_title">Edit custom filter</string> <string name="revanced_custom_filter_strings_title">Edit custom filter</string>
<string name="revanced_custom_filter_summary">Enables custom filters</string> <string name="revanced_custom_filter_summary">Enables custom filter to hide layout components.</string>
<string name="revanced_custom_filter_title">Enable custom filter</string> <string name="revanced_custom_filter_title">Enable custom filter</string>
<string name="revanced_disable_auto_captions_summary">Disables forced auto captions.</string> <string name="revanced_disable_auto_captions_summary">Disables forced auto captions.</string>
<string name="revanced_disable_auto_captions_title">Disable forced auto captions</string> <string name="revanced_disable_auto_captions_title">Disable forced auto captions</string>
@ -21,7 +21,7 @@
<string name="revanced_enable_color_match_player_title">Enable color match player</string> <string name="revanced_enable_color_match_player_title">Enable color match player</string>
<string name="revanced_enable_compact_dialog_summary">Enable compact dialog on phone.</string> <string name="revanced_enable_compact_dialog_summary">Enable compact dialog on phone.</string>
<string name="revanced_enable_compact_dialog_title">Enable compact dialog</string> <string name="revanced_enable_compact_dialog_title">Enable compact dialog</string>
<string name="revanced_enable_debug_logging_summary">Prints the debug log</string> <string name="revanced_enable_debug_logging_summary">Prints the debug log.</string>
<string name="revanced_enable_debug_logging_title">Enable debug logging</string> <string name="revanced_enable_debug_logging_title">Enable debug logging</string>
<string name="revanced_enable_flyout_panel_playback_speed_summary">Add an playback speed button to the flyout panel.</string> <string name="revanced_enable_flyout_panel_playback_speed_summary">Add an playback speed button to the flyout panel.</string>
<string name="revanced_enable_flyout_panel_playback_speed_title">Enable playback speed</string> <string name="revanced_enable_flyout_panel_playback_speed_title">Enable playback speed</string>
@ -48,7 +48,7 @@
<string name="revanced_enable_zen_mode_summary">Adds a grey tint to the video player to reduce eye strain.</string> <string name="revanced_enable_zen_mode_summary">Adds a grey tint to the video player to reduce eye strain.</string>
<string name="revanced_enable_zen_mode_title">Enable zen mode</string> <string name="revanced_enable_zen_mode_title">Enable zen mode</string>
<string name="revanced_external_downloader_not_installed_warning" formatted="false">%s is not installed. Please install it.</string> <string name="revanced_external_downloader_not_installed_warning" formatted="false">%s is not installed. Please install it.</string>
<string name="revanced_external_downloader_package_name_summary">Package name of your installed external downloader app, such as NewPipe or Seal</string> <string name="revanced_external_downloader_package_name_summary">Package name of your installed external downloader app, such as NewPipe or Seal.</string>
<string name="revanced_external_downloader_package_name_title">External downloader package name</string> <string name="revanced_external_downloader_package_name_title">External downloader package name</string>
<string name="revanced_flyout_panel_watch_on_youtube">Watch on YouTube</string> <string name="revanced_flyout_panel_watch_on_youtube">Watch on YouTube</string>
<string name="revanced_hide_button_container_label_summary">Hide labels in button container.</string> <string name="revanced_hide_button_container_label_summary">Hide labels in button container.</string>