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

refactor: move integrations to correct package

Browse Source
This commit is contained in:
inotia00 2024-01-18 11:34:07 +09:00
parent 0ca730ab76
commit afdc1af509
29 changed files with 49 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/kotlin/app/revanced/patches/music/utils/integrations/Constants.kt
View File

@ -2,7 +2,7 @@ package app.revanced.patches.music.utils.integrations
@Suppress("MemberVisibilityCanBePrivate")
object Constants {
const val INTEGRATIONS_PATH = "Lapp/revanced/music"
const val INTEGRATIONS_PATH = "Lapp/revanced/integrations/music"
const val PATCHES_PATH = "$INTEGRATIONS_PATH/patches"
const val ACCOUNT_PATH = "$PATCHES_PATH/account"

2
src/main/kotlin/app/revanced/patches/music/utils/litho/fingerprints/LithoFilterFingerprint.kt
View File

@ -8,6 +8,6 @@ object LithoFilterFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.CONSTRUCTOR,
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/music/patches/components/LithoFilterPatch;"
methodDef.definingClass == "Lapp/revanced/integrations/music/patches/components/LithoFilterPatch;"
}
)

2
src/main/kotlin/app/revanced/patches/music/utils/overridequality/fingerprints/VideoQualityPatchFingerprint.kt
View File

@ -9,7 +9,7 @@ object VideoQualityPatchFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
parameters = listOf("I"),
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/music/patches/video/VideoQualityPatch;"
methodDef.definingClass == "Lapp/revanced/integrations/music/patches/video/VideoQualityPatch;"
&& methodDef.name == "overrideQuality"
}
)

2
src/main/kotlin/app/revanced/patches/music/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt
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/video/PlaybackSpeedPatch;"
methodDef.definingClass == "Lapp/revanced/integrations/music/patches/video/PlaybackSpeedPatch;"
&& methodDef.name == "overrideSpeed"
}
)

2
src/main/kotlin/app/revanced/patches/music/utils/sponsorblock/SponsorBlockBytecodePatch.kt
View File

@ -37,7 +37,7 @@ object SponsorBlockBytecodePatch : BytecodePatch(
)
) {
private const val INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR =
"Lapp/revanced/music/sponsorblock/SegmentPlaybackController;"
"Lapp/revanced/integrations/music/sponsorblock/SegmentPlaybackController;"
private lateinit var rectangleFieldName: String
override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/reddit/ad/comments/HideCommentAdsPatch.kt
View File

@ -13,7 +13,7 @@ object HideCommentAdsPatch : BytecodePatch(
setOf(HideCommentAdsFingerprint)
) {
private const val INTEGRATION_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/GeneralAdsPatch;" +
"Lapp/revanced/integrations/reddit/patches/GeneralAdsPatch;" +
"->hideCommentAds()Z"
override fun execute(context: BytecodeContext) {

4
src/main/kotlin/app/revanced/patches/reddit/ad/general/HideAdsPatch.kt
View File

@ -36,11 +36,11 @@ object HideAdsPatch : BytecodePatch(
)
) {
private const val INTEGRATIONS_OLD_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/GeneralAdsPatch;" +
"Lapp/revanced/integrations/reddit/patches/GeneralAdsPatch;" +
"->hideOldPostAds(Ljava/util/List;)Ljava/util/List;"
private const val INTEGRATIONS_NEW_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/GeneralAdsPatch;" +
"Lapp/revanced/integrations/reddit/patches/GeneralAdsPatch;" +
"->hideNewPostAds()Z"
override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/reddit/layout/navigation/NavigationButtonsPatch.kt
View File

@ -23,7 +23,7 @@ object NavigationButtonsPatch : BytecodePatch(
setOf(BottomNavScreenFingerprint)
) {
private const val INTEGRATIONS_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/NavigationButtonsPatch;" +
"Lapp/revanced/integrations/reddit/patches/NavigationButtonsPatch;" +
"->hideNavigationButtons(Landroid/view/ViewGroup;)V"
override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/reddit/layout/recentlyvisited/RecentlyVisitedShelfPatch.kt
View File

@ -23,7 +23,7 @@ object RecentlyVisitedShelfPatch : BytecodePatch(
setOf(CommunityDrawerPresenterFingerprint)
) {
private const val INTEGRATIONS_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/RecentlyVisitedShelfPatch;" +
"Lapp/revanced/integrations/reddit/patches/RecentlyVisitedShelfPatch;" +
"->hideRecentlyVisitedShelf(Ljava/util/List;)Ljava/util/List;"
override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/reddit/layout/screenshotpopup/ScreenshotPopupPatch.kt
View File

@ -24,7 +24,7 @@ object ScreenshotPopupPatch : BytecodePatch(
setOf(ScreenshotTakenBannerFingerprint)
) {
private const val INTEGRATIONS_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/ScreenshotPopupPatch;" +
"Lapp/revanced/integrations/reddit/patches/ScreenshotPopupPatch;" +
"->disableScreenshotPopup()Z"
override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/reddit/layout/toolbar/ToolBarButtonPatch.kt
View File

@ -30,7 +30,7 @@ object ToolBarButtonPatch : BytecodePatch(
setOf(HomePagerScreenFingerprint)
) {
private const val INTEGRATIONS_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/ToolBarButtonPatch;" +
"Lapp/revanced/integrations/reddit/patches/ToolBarButtonPatch;" +
"->hideToolBarButton(Landroid/view/View;)V"
override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/reddit/misc/openlink/OpenLinksDirectlyPatch.kt
View File

@ -21,7 +21,7 @@ object OpenLinksDirectlyPatch : BytecodePatch(
setOf(ScreenNavigatorFingerprint)
) {
private const val INTEGRATIONS_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/OpenLinksDirectlyPatch;" +
"Lapp/revanced/integrations/reddit/patches/OpenLinksDirectlyPatch;" +
"->parseRedirectUri(Landroid/net/Uri;)Landroid/net/Uri;"
override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/reddit/misc/openlink/OpenLinksExternallyPatch.kt
View File

@ -24,7 +24,7 @@ object OpenLinksExternallyPatch : BytecodePatch(
setOf(ScreenNavigatorFingerprint)
) {
private const val INTEGRATIONS_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/OpenLinksExternallyPatch;"
"Lapp/revanced/integrations/reddit/patches/OpenLinksExternallyPatch;"
override fun execute(context: BytecodeContext) {
ScreenNavigatorFingerprint.result?.let {

2
src/main/kotlin/app/revanced/patches/reddit/misc/tracking/url/SanitizeUrlQueryPatch.kt
View File

@ -23,7 +23,7 @@ object SanitizeUrlQueryPatch : BytecodePatch(
setOf(ShareLinkFormatterFingerprint)
) {
private const val SANITIZE_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/patches/SanitizeUrlQueryPatch;" +
"Lapp/revanced/integrations/reddit/patches/SanitizeUrlQueryPatch;" +
"->stripQueryParameters()Z"
override fun execute(context: BytecodeContext) {

2
src/main/kotlin/app/revanced/patches/reddit/utils/integrations/IntegrationsPatch.kt
View File

@ -6,6 +6,6 @@ import app.revanced.patches.shared.patch.integrations.AbstractIntegrationsPatch
@Patch(requiresIntegrations = true)
object IntegrationsPatch : AbstractIntegrationsPatch(
"Lapp/revanced/reddit/utils/ReVancedUtils;",
"Lapp/revanced/integrations/reddit/utils/ReVancedUtils;",
setOf(InitFingerprint),
)

4
src/main/kotlin/app/revanced/patches/reddit/utils/settings/SettingsBytecodePatch.kt
View File

@ -25,7 +25,7 @@ object SettingsBytecodePatch : BytecodePatch(
)
) {
private const val INTEGRATIONS_METHOD_DESCRIPTOR =
"Lapp/revanced/reddit/settingsmenu/ReVancedSettingActivity;->initializeSettings(Landroid/app/Activity;)V"
"Lapp/revanced/integrations/reddit/settingsmenu/ReVancedSettingActivity;->initializeSettings(Landroid/app/Activity;)V"
private lateinit var settingsMethod: MutableMethod
@ -33,7 +33,7 @@ object SettingsBytecodePatch : BytecodePatch(
settingsMethod.apply {
addInstruction(
0,
"invoke-static {}, Lapp/revanced/reddit/settingsmenu/SettingsStatus;->$description()V"
"invoke-static {}, Lapp/revanced/integrations/reddit/settingsmenu/SettingsStatus;->$description()V"
)
}
}

2
src/main/kotlin/app/revanced/patches/reddit/utils/settings/fingerprints/SettingsStatusLoadFingerprint.kt
View File

@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint.MethodFingerprint
object SettingsStatusLoadFingerprint : MethodFingerprint(
customFingerprint = { methodDef, _ ->
methodDef.definingClass.endsWith("Lapp/revanced/reddit/settingsmenu/SettingsStatus;") &&
methodDef.definingClass.endsWith("Lapp/revanced/integrations/reddit/settingsmenu/SettingsStatus;") &&
methodDef.name == "load"
}
)

2
src/main/kotlin/app/revanced/patches/youtube/general/accountmenu/fingerprints/AccountMenuPatchFingerprint.kt
View File

@ -8,7 +8,7 @@ object AccountMenuPatchFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PRIVATE or AccessFlags.STATIC,
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/integrations/patches/general/GeneralPatch;"
methodDef.definingClass == "Lapp/revanced/integrations/youtube/patches/general/GeneralPatch;"
&& methodDef.name == "hideAccountMenu"
}
)

1
src/main/kotlin/app/revanced/patches/youtube/misc/spoofdimensions/SpoofDeviceDimensionsPatch.kt
View File

@ -43,6 +43,7 @@ import com.android.tools.smali.dexlib2.util.MethodUtil
)
]
)
@Suppress("unused")
object SpoofDeviceDimensionsPatch : BytecodePatch(
setOf(DeviceDimensionsModelToStringFingerprint)
) {

2
src/main/kotlin/app/revanced/patches/youtube/swipe/controls/fingerprints/SwipeControlsHostActivityFingerprint.kt
View File

@ -8,6 +8,6 @@ object SwipeControlsHostActivityFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.CONSTRUCTOR,
parameters = emptyList(),
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/integrations/swipecontrols/SwipeControlsHostActivity;"
methodDef.definingClass == "Lapp/revanced/integrations/youtube/swipecontrols/SwipeControlsHostActivity;"
}
)

2
src/main/kotlin/app/revanced/patches/youtube/utils/integrations/Constants.kt
View File

@ -2,7 +2,7 @@ package app.revanced.patches.youtube.utils.integrations
@Suppress("MemberVisibilityCanBePrivate")
object Constants {
const val INTEGRATIONS_PATH = "Lapp/revanced/integrations"
const val INTEGRATIONS_PATH = "Lapp/revanced/integrations/youtube"
const val PATCHES_PATH = "$INTEGRATIONS_PATH/patches"
const val ADS_PATH = "$PATCHES_PATH/ads"

2
src/main/kotlin/app/revanced/patches/youtube/utils/litho/fingerprints/LithoFilterFingerprint.kt
View File

@ -8,6 +8,6 @@ object LithoFilterFingerprint : MethodFingerprint(
returnType = "V",
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC or AccessFlags.CONSTRUCTOR,
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/integrations/patches/components/LithoFilterPatch;"
methodDef.definingClass == "Lapp/revanced/integrations/youtube/patches/components/LithoFilterPatch;"
}
)

2
src/main/kotlin/app/revanced/patches/youtube/utils/overridequality/fingerprints/VideoQualityPatchFingerprint.kt
View File

@ -9,7 +9,7 @@ object VideoQualityPatchFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PUBLIC or AccessFlags.STATIC,
parameters = listOf("I"),
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/integrations/patches/video/VideoQualityPatch;"
methodDef.definingClass == "Lapp/revanced/integrations/youtube/patches/video/VideoQualityPatch;"
&& methodDef.name == "overrideQuality"
}
)

2
src/main/kotlin/app/revanced/patches/youtube/utils/overridespeed/fingerprints/PlaybackSpeedPatchFingerprint.kt
View File

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

2
src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockBytecodePatch.kt
View File

@ -218,7 +218,7 @@ object SponsorBlockBytecodePatch : BytecodePatch(
}
private const val INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR =
"Lapp/revanced/integrations/sponsorblock"
"Lapp/revanced/integrations/youtube/sponsorblock"
private const val INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR =
"$INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR/SegmentPlaybackController;"

2
src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/fingerprints/SegmentPlaybackControllerFingerprint.kt
View File

@ -11,7 +11,7 @@ object SegmentPlaybackControllerFingerprint : MethodFingerprint(
parameters = listOf("Ljava/lang/Object;"),
opcodes = listOf(Opcode.CONST_STRING),
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/integrations/sponsorblock/SegmentPlaybackController;"
methodDef.definingClass == "Lapp/revanced/integrations/youtube/sponsorblock/SegmentPlaybackController;"
&& methodDef.name == "setSponsorBarRect"
}
)

2
src/main/kotlin/app/revanced/patches/youtube/utils/toolbar/fingerprints/ToolBarPatchFingerprint.kt
View File

@ -7,7 +7,7 @@ import com.android.tools.smali.dexlib2.AccessFlags
object ToolBarPatchFingerprint : MethodFingerprint(
accessFlags = AccessFlags.PRIVATE or AccessFlags.STATIC,
customFingerprint = { methodDef, _ ->
methodDef.definingClass == "Lapp/revanced/integrations/patches/utils/ToolBarPatch;"
methodDef.definingClass == "Lapp/revanced/integrations/youtube/patches/utils/ToolBarPatch;"
&& methodDef.name == "hookToolBar"
}
)

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

@ -32,13 +32,13 @@
<!-- PREFERENCE: ALTERNATIVE_THUMBNAILS_SETTINGS
<PreferenceScreen android:title="@string/revanced_alt_thumbnails" android:key="alt_thumbnails">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_alt_thumbnails" />
<app.revanced.integrations.settingsmenu.AlternativeThumbnailsStatusPreference android:title="@string/revanced_alt_thumbnail_about_title" />
<app.revanced.integrations.youtube.settingsmenu.AlternativeThumbnailsStatusPreference android:title="@string/revanced_alt_thumbnail_about_title" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_alt_thumbnail_dearrow" />
<SwitchPreference android:title="@string/revanced_alt_thumbnail_dearrow_title" android:key="revanced_alt_thumbnail_dearrow" android:defaultValue="false" android:summaryOn="@string/revanced_alt_thumbnail_dearrow_summary_on" android:summaryOff="@string/revanced_alt_thumbnail_dearrow_summary_off" />
<SwitchPreference android:title="@string/revanced_alt_thumbnail_dearrow_connection_toast_title" android:key="revanced_alt_thumbnail_dearrow_connection_toast" android:defaultValue="false" android:summaryOn="@string/revanced_alt_thumbnail_dearrow_connection_toast_summary_on" android:summaryOff="@string/revanced_alt_thumbnail_dearrow_connection_toast_summary_off" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_alt_thumbnail_dearrow_api_url_title" android:key="revanced_alt_thumbnail_dearrow_api_url" android:defaultValue="https://dearrow-thumb.ajay.app/api/v1/getThumbnail" android:summary="@string/revanced_alt_thumbnail_dearrow_api_url_summary" android:inputType="text" />
<app.revanced.integrations.settingsmenu.AlternativeThumbnailsAboutDeArrowPreference android:title="@string/revanced_alt_thumbnail_dearrow_about_title" android:selectable="true" android:summary="@string/revanced_alt_thumbnail_dearrow_about_summary" />
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_alt_thumbnail_dearrow_api_url_title" android:key="revanced_alt_thumbnail_dearrow_api_url" android:defaultValue="https://dearrow-thumb.ajay.app/api/v1/getThumbnail" android:summary="@string/revanced_alt_thumbnail_dearrow_api_url_summary" android:inputType="text" />
<app.revanced.integrations.youtube.settingsmenu.AlternativeThumbnailsAboutDeArrowPreference android:title="@string/revanced_alt_thumbnail_dearrow_about_title" android:selectable="true" android:summary="@string/revanced_alt_thumbnail_dearrow_about_summary" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_alt_thumbnail_stills" />
<SwitchPreference android:title="@string/revanced_alt_thumbnail_stills_title" android:key="revanced_alt_thumbnail_stills" android:defaultValue="false" android:summaryOn="@string/revanced_alt_thumbnail_stills_summary_on" android:summaryOff="@string/revanced_alt_thumbnail_stills_summary_off" />
@ -96,7 +96,7 @@
<!-- SETTINGS: HIDE_FEED_FLYOUT_PANEL
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_feed_flyout_panel_title" />
<SwitchPreference android:title="@string/revanced_hide_feed_flyout_panel_title" android:key="revanced_hide_feed_flyout_panel" android:defaultValue="false" android:summaryOn="@string/revanced_hide_feed_flyout_panel_summary_on" android:summaryOff="@string/revanced_hide_feed_flyout_panel_summary_off" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_hide_feed_flyout_panel_filter_strings_title" android:key="revanced_hide_feed_flyout_panel_filter_strings" android:summary="@string/revanced_hide_feed_flyout_panel_filter_strings_summary" android:defaultValue="" android:inputType="textMultiLine" />SETTINGS: HIDE_FEED_FLYOUT_PANEL -->
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_hide_feed_flyout_panel_filter_strings_title" android:key="revanced_hide_feed_flyout_panel_filter_strings" android:summary="@string/revanced_hide_feed_flyout_panel_filter_strings_summary" android:defaultValue="" android:inputType="textMultiLine" />SETTINGS: HIDE_FEED_FLYOUT_PANEL -->
<!-- SETTINGS: PLAYER_FLYOUT_PANEL_HEADER
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player_flyout_panel_title" />SETTINGS: PLAYER_FLYOUT_PANEL_HEADER -->
@ -165,7 +165,7 @@
<SwitchPreference android:title="@string/revanced_hide_quick_actions_related_videos_title" android:key="revanced_hide_quick_actions_related_videos" android:defaultValue="false" android:summaryOn="@string/revanced_hide_quick_actions_related_videos_summary_on" android:summaryOff="@string/revanced_hide_quick_actions_related_videos_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_quick_actions_save_to_playlist_title" android:key="revanced_hide_quick_actions_save_to_playlist" android:defaultValue="false" android:summaryOn="@string/revanced_hide_quick_actions_save_to_playlist_summary_on" android:summaryOff="@string/revanced_hide_quick_actions_save_to_playlist_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_quick_actions_share_title" android:key="revanced_hide_quick_actions_share" android:defaultValue="false" android:summaryOn="@string/revanced_hide_quick_actions_share_summary_on" android:summaryOff="@string/revanced_hide_quick_actions_share_summary_off" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:hint="12" android:defaultValue="12" android:title="@string/revanced_quick_actions_margin_top_title" android:key="revanced_quick_actions_margin_top" android:summary="@string/revanced_quick_actions_margin_top_summary" android:inputType="number" />SETTINGS: QUICK_ACTIONS_COMPONENTS -->
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:hint="12" android:defaultValue="12" android:title="@string/revanced_quick_actions_margin_top_title" android:key="revanced_quick_actions_margin_top" android:summary="@string/revanced_quick_actions_margin_top_summary" android:inputType="number" />SETTINGS: QUICK_ACTIONS_COMPONENTS -->
<!-- SETTINGS: FULLSCREEN_EXPERIMENTAL_FLAGS
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_experimental_flag" />SETTINGS: FULLSCREEN_EXPERIMENTAL_FLAGS -->
@ -208,7 +208,7 @@
<!-- SETTINGS: HIDE_ACCOUNT_MENU
<SwitchPreference android:title="@string/revanced_hide_account_menu_title" android:key="revanced_hide_account_menu" android:defaultValue="false" android:summary="@string/revanced_hide_account_menu_summary" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_hide_account_menu_filter_strings_title" android:key="revanced_hide_account_menu_filter_strings" android:summary="@string/revanced_hide_account_menu_filter_strings_summary" android:defaultValue="" android:inputType="textMultiLine" />SETTINGS: HIDE_ACCOUNT_MENU -->
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_hide_account_menu_filter_strings_title" android:key="revanced_hide_account_menu_filter_strings" android:summary="@string/revanced_hide_account_menu_filter_strings_summary" android:defaultValue="" android:inputType="textMultiLine" />SETTINGS: HIDE_ACCOUNT_MENU -->
<!-- SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS
<SwitchPreference android:title="@string/revanced_hide_auto_player_popup_panels_title" android:key="revanced_hide_auto_player_popup_panels" android:defaultValue="true" android:summaryOn="@string/revanced_hide_auto_player_popup_panels_summary_on" android:summaryOff="@string/revanced_hide_auto_player_popup_panels_summary_off" />SETTINGS: HIDE_AUTO_PLAYER_POPUP_PANELS -->
@ -257,7 +257,7 @@
<!-- SETTINGS: HIDE_LAYOUT_COMPONENTS
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_layout_title" />
<SwitchPreference android:title="@string/revanced_custom_filter_title" android:key="revanced_custom_filter" android:defaultValue="false" android:summaryOn="@string/revanced_custom_filter_summary_on" android:summaryOff="@string/revanced_custom_filter_summary_off" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_filter_strings_title" android:key="revanced_custom_filter_strings" android:summary="@string/revanced_custom_filter_strings_summary" android:defaultValue="" android:inputType="textMultiLine" />
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_filter_strings_title" android:key="revanced_custom_filter_strings" android:summary="@string/revanced_custom_filter_strings_summary" android:defaultValue="" android:inputType="textMultiLine" />
<SwitchPreference android:title="@string/revanced_hide_album_card_title" android:key="revanced_hide_album_card" android:defaultValue="true" android:summaryOn="@string/revanced_hide_album_card_summary_on" android:summaryOff="@string/revanced_hide_album_card_summary_off" />
<SwitchPreference android:title="@string/revanced_hide_chips_shelf_title" android:key="revanced_hide_chips_shelf" android:defaultValue="true" android:summaryOn="@string/revanced_hide_chips_shelf_on" android:summaryOff="@string/revanced_hide_chips_shelf_off" />
<SwitchPreference android:title="@string/revanced_hide_community_posts_home_title" android:key="revanced_hide_community_posts_home" android:defaultValue="true" android:summaryOn="@string/revanced_hide_community_posts_home_summary_on" android:summaryOff="@string/revanced_hide_community_posts_home_summary_off" />
@ -343,7 +343,7 @@
<Preference android:title="@string/revanced_extended_settings_export_title" android:key="revanced_extended_settings_export" android:summary="@string/revanced_extended_settings_export_summary" />
<Preference android:title="@string/revanced_extended_settings_import_title" android:key="revanced_extended_settings_import" android:summary="@string/revanced_extended_settings_import_summary" />
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_extended_settings_import_export_as_text_title" />
<app.revanced.integrations.settingsmenu.ImportExportPreference android:title="@string/revanced_extended_settings_import_export_title" android:summary="@string/revanced_extended_settings_import_export_as_text_summary" android:inputType="textMultiLine" />
<app.revanced.integrations.youtube.settingsmenu.ImportExportPreference android:title="@string/revanced_extended_settings_import_export_title" android:summary="@string/revanced_extended_settings_import_export_as_text_summary" android:inputType="textMultiLine" />
</PreferenceScreen>
<Preference android:title="@string/revanced_default_app_settings_title" android:key="revanced_default_app_settings" android:summary="@string/revanced_default_app_settings_summary" />
@ -376,7 +376,7 @@
<!-- SETTINGS: SPOOF_APP_VERSION
<SwitchPreference android:title="@string/revanced_spoof_app_version_title" android:key="revanced_spoof_app_version" android:defaultValue="false" android:summary="@string/revanced_spoof_app_version_summary" />
<ListPreference android:title="@string/revanced_spoof_app_version_target_entry_title" android:key="revanced_spoof_app_version_target" android:entries="@array/revanced_spoof_app_version_target_entry" android:defaultValue="18.17.43" android:entryValues="@array/revanced_spoof_app_version_target_entry_value" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:hint="18.17.43" android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:summary="@string/revanced_spoof_app_version_target_summary" android:inputType="text" android:dependency="revanced_spoof_app_version" />SETTINGS: SPOOF_APP_VERSION -->
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:hint="18.17.43" android:title="@string/revanced_spoof_app_version_target_title" android:key="revanced_spoof_app_version_target" android:summary="@string/revanced_spoof_app_version_target_summary" android:inputType="text" android:dependency="revanced_spoof_app_version" />SETTINGS: SPOOF_APP_VERSION -->
<!-- SETTINGS: SPOOF_DEVICE_DIMENSIONS
<SwitchPreference android:title="@string/revanced_spoof_device_dimensions_title" android:key="revanced_spoof_device_dimensions" android:defaultValue="false" android:summary="@string/revanced_spoof_device_dimensions_summary" />SETTINGS: SPOOF_DEVICE_DIMENSIONS -->
@ -564,7 +564,7 @@
<SwitchPreference android:title="@string/revanced_overlay_button_speed_dialog_title" android:key="revanced_overlay_button_speed_dialog" android:defaultValue="false" android:summary="@string/revanced_overlay_button_speed_dialog_summary" />
<PreferenceScreen android:title="@string/revanced_external_downloader_settings_title" android:key="external_downloader" android:summary="@string/revanced_external_downloader_settings_summary">
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_external_downloader_settings_title" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:hint="com.deniscerri.ytdl" android:defaultValue="com.deniscerri.ytdl" android:title="@string/revanced_external_downloader_package_name_title" android:key="revanced_external_downloader_package_name" android:summary="@string/revanced_external_downloader_package_name_summary" android:inputType="text" />
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:hint="com.deniscerri.ytdl" android:defaultValue="com.deniscerri.ytdl" android:title="@string/revanced_external_downloader_package_name_title" android:key="revanced_external_downloader_package_name" android:summary="@string/revanced_external_downloader_package_name_summary" android:inputType="text" />
</PreferenceScreen>
</PreferenceScreen>PREFERENCE: OVERLAY_BUTTONS -->
@ -574,7 +574,7 @@
<Preference android:title=" " android:selectable="false" android:summary="@string/revanced_player" />PREFERENCE: PLAYER_SETTINGS -->
<!-- SETTINGS: CUSTOM_PLAYER_OVERLAY_OPACITY
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:hint="100" android:defaultValue="100" android:title="@string/revanced_custom_player_overlay_opacity_title" android:key="revanced_custom_player_overlay_opacity" android:summary="@string/revanced_custom_player_overlay_opacity_summary" android:inputType="number" />SETTINGS: CUSTOM_PLAYER_OVERLAY_OPACITY -->
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:hint="100" android:defaultValue="100" android:title="@string/revanced_custom_player_overlay_opacity_title" android:key="revanced_custom_player_overlay_opacity" android:summary="@string/revanced_custom_player_overlay_opacity_summary" android:inputType="number" />SETTINGS: CUSTOM_PLAYER_OVERLAY_OPACITY -->
<!-- SETTINGS: DISABLE_SPEED_OVERLAY
<SwitchPreference android:title="@string/revanced_disable_speed_overlay_title" android:key="revanced_disable_speed_overlay" android:defaultValue="false" android:summary="@string/revanced_disable_speed_overlay_summary" />SETTINGS: DISABLE_SPEED_OVERLAY -->
@ -649,7 +649,7 @@
<!-- SETTINGS: CUSTOM_SEEKBAR_COLOR
<SwitchPreference android:title="@string/revanced_enable_custom_seekbar_color_title" android:key="revanced_enable_custom_seekbar_color" android:defaultValue="true" android:summaryOn="@string/revanced_enable_custom_seekbar_color_summary_on" android:summaryOff="@string/revanced_enable_custom_seekbar_color_summary_off" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_seekbar_color_value_title" android:key="revanced_custom_seekbar_color_value" android:summary="@string/revanced_custom_seekbar_color_value_summary" android:defaultValue="#ff0000" android:hint="#ff0000" android:inputType="text" />SETTINGS: CUSTOM_SEEKBAR_COLOR -->
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_seekbar_color_value_title" android:key="revanced_custom_seekbar_color_value" android:summary="@string/revanced_custom_seekbar_color_value_summary" android:defaultValue="#ff0000" android:hint="#ff0000" android:inputType="text" />SETTINGS: CUSTOM_SEEKBAR_COLOR -->
<!-- SETTINGS: ENABLE_NEW_THUMBNAIL_PREVIEW
<SwitchPreference android:title="@string/revanced_enable_new_thumbnail_preview_title" android:key="revanced_enable_new_thumbnail_preview" android:defaultValue="false" android:summaryOn="@string/revanced_enable_new_thumbnail_preview_summary_on" android:summaryOff="@string/revanced_enable_new_thumbnail_preview_summary_off" />SETTINGS: ENABLE_NEW_THUMBNAIL_PREVIEW -->
@ -717,10 +717,10 @@
<SwitchPreference android:title="@string/revanced_enable_swipe_press_to_engage_title" android:key="revanced_enable_swipe_press_to_engage" android:defaultValue="false" android:summaryOn="@string/revanced_enable_swipe_press_to_engage_summary_on" android:summaryOff="@string/revanced_enable_swipe_press_to_engage_summary_off" />
<SwitchPreference android:title="@string/revanced_enable_swipe_haptic_feedback_title" android:key="revanced_enable_swipe_haptic_feedback" android:defaultValue="true" android:summaryOn="@string/revanced_enable_swipe_haptic_feedback_summary_on" android:summaryOff="@string/revanced_enable_swipe_haptic_feedback_summary_off" android:dependency="revanced_enable_swipe_press_to_engage" />
<SwitchPreference android:title="@string/revanced_swipe_gestures_lock_mode_title" android:key="revanced_swipe_gestures_lock_mode" android:defaultValue="false" android:summaryOn="@string/revanced_swipe_gestures_lock_mode_summary_on" android:summaryOff="@string/revanced_swipe_gestures_lock_mode_summary_off" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_background_alpha_title" android:key="revanced_swipe_overlay_background_alpha" android:summary="@string/revanced_swipe_overlay_background_alpha_summary" android:defaultValue="127" android:inputType="number" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_magnitude_threshold_title" android:key="revanced_swipe_magnitude_threshold" android:summary="@string/revanced_swipe_magnitude_threshold_summary" android:defaultValue="0" android:inputType="number" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_text_size_title" android:key="revanced_swipe_overlay_text_size" android:summary="@string/revanced_swipe_overlay_text_size_summary" android:defaultValue="27" android:inputType="number" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_timeout_title" android:key="revanced_swipe_overlay_timeout" android:summary="@string/revanced_swipe_overlay_timeout_summary" android:defaultValue="500" android:inputType="number" />
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_background_alpha_title" android:key="revanced_swipe_overlay_background_alpha" android:summary="@string/revanced_swipe_overlay_background_alpha_summary" android:defaultValue="127" android:inputType="number" />
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_magnitude_threshold_title" android:key="revanced_swipe_magnitude_threshold" android:summary="@string/revanced_swipe_magnitude_threshold_summary" android:defaultValue="0" android:inputType="number" />
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_text_size_title" android:key="revanced_swipe_overlay_text_size" android:summary="@string/revanced_swipe_overlay_text_size_summary" android:defaultValue="27" android:inputType="number" />
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_swipe_overlay_timeout_title" android:key="revanced_swipe_overlay_timeout" android:summary="@string/revanced_swipe_overlay_timeout_summary" android:defaultValue="500" android:inputType="number" />
<Preference android:title=" " android:selectable="false" android:key="revanced_experimental_flag" android:summary="@string/revanced_experimental_flag" />
<SwitchPreference android:title="@string/revanced_disable_hdr_auto_brightness_title" android:key="revanced_disable_hdr_auto_brightness" android:defaultValue="true" android:summaryOn="@string/revanced_disable_hdr_auto_brightness_summary_on" android:summaryOff="@string/revanced_disable_hdr_auto_brightness_summary_off" />SETTINGS: SWIPE_CONTROLS -->
@ -748,7 +748,7 @@
<!-- SETTINGS: CUSTOM_PLAYBACK_SPEED
<SwitchPreference android:title="@string/revanced_enable_custom_playback_speed_title" android:key="revanced_enable_custom_playback_speed" android:defaultValue="false" android:summaryOn="@string/revanced_enable_custom_playback_speed_summary_on" android:summaryOff="@string/revanced_enable_custom_playback_speed_summary_off" />
<SwitchPreference android:title="@string/revanced_custom_playback_speed_panel_type_title" android:key="revanced_custom_playback_speed_panel_type" android:defaultValue="false" android:summaryOn="@string/revanced_custom_playback_speed_panel_type_summary_on" android:summaryOff="@string/revanced_custom_playback_speed_panel_type_summary_off" />
<app.revanced.integrations.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_playback_speeds_title" android:key="revanced_custom_playback_speeds" android:summary="@string/revanced_custom_playback_speeds_summary" android:defaultValue="0.25\n0.5\n0.75\n1.0\n1.25\n1.5\n1.75\n2.0\n2.25\n2.5" android:inputType="textMultiLine" />SETTINGS: CUSTOM_PLAYBACK_SPEED -->
<app.revanced.integrations.youtube.settingsmenu.ResettableEditTextPreference android:title="@string/revanced_custom_playback_speeds_title" android:key="revanced_custom_playback_speeds" android:summary="@string/revanced_custom_playback_speeds_summary" android:defaultValue="0.25\n0.5\n0.75\n1.0\n1.25\n1.5\n1.75\n2.0\n2.25\n2.5" android:inputType="textMultiLine" />SETTINGS: CUSTOM_PLAYBACK_SPEED -->
<!-- SETTINGS: DEFAULT_PLAYBACK_SPEED
<SwitchPreference android:title="@string/revanced_enable_save_playback_speed_title" android:key="revanced_enable_save_playback_speed" android:defaultValue="false" android:summaryOn="@string/revanced_enable_save_playback_speed_summary_on" android:summaryOff="@string/revanced_enable_save_playback_speed_summary_off" />SETTINGS: DEFAULT_PLAYBACK_SPEED -->

6
src/main/resources/youtube/sponsorblock/shared/layout/inline_sponsor_overlay.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
<app.revanced.integrations.youtube.sponsorblock.ui.SkipSponsorButton
android:id="@+id/sb_skip_highlight_button"
android:contentDescription="@string/sb_skip_button_compact_highlight"
android:layout_width="wrap_content"
@ -12,7 +12,7 @@
android:focusable="true"
android:visibility="gone" />
<app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
<app.revanced.integrations.youtube.sponsorblock.ui.SkipSponsorButton
android:id="@+id/sb_skip_sponsor_button"
android:contentDescription="@string/sb_skip_button_compact"
android:layout_width="wrap_content"
@ -23,7 +23,7 @@
android:focusable="true"
android:visibility="gone" />
<app.revanced.integrations.sponsorblock.ui.NewSegmentLayout
<app.revanced.integrations.youtube.sponsorblock.ui.NewSegmentLayout
android:id="@+id/sb_new_segment_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"