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

fix(YouTube/SponsorBlock): applying the outline icon makes skip button overlaps

Browse Source
This commit is contained in:
inotia00
2023-11-07 21:16:19 +09:00
parent bba0293460
commit ebcadd5c6f
5 changed files with 12 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/kotlin/app/revanced/patches/youtube/utils/sponsorblock/SponsorBlockPatch.kt
View File

@ -53,13 +53,21 @@ object SponsorBlockPatch : ResourcePatch() {
/**
* merge SponsorBlock drawables to main drawables
*/
arrayOf(
ResourceUtils.ResourceGroup(
"layout",
"inline_sponsor_overlay.xml",
"skip_sponsor_button.xml"
)
).forEach { resourceGroup ->
context.copyResources("youtube/sponsorblock/shared", resourceGroup)
}
if (OutlineIcon == true) {
arrayOf(
ResourceUtils.ResourceGroup(
"layout",
"inline_sponsor_overlay.xml",
"new_segment.xml",
"skip_sponsor_button.xml"
"new_segment.xml"
),
ResourceUtils.ResourceGroup(
"drawable",
@ -80,9 +88,7 @@ object SponsorBlockPatch : ResourcePatch() {
arrayOf(
ResourceUtils.ResourceGroup(
"layout",
"inline_sponsor_overlay.xml",
"new_segment.xml",
"skip_sponsor_button.xml"
"new_segment.xml"
),
ResourceUtils.ResourceGroup(
"drawable",

35
src/main/resources/youtube/sponsorblock/outline/layout/inline_sponsor_overlay.xml
View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android">
<app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
android:id="@+id/sb_skip_highlight_button"
android:contentDescription="@string/sb_skip_button_compact_highlight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginRight="20dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height"
android:focusable="true"
android:visibility="gone" />
<app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
android:id="@+id/sb_skip_sponsor_button"
android:contentDescription="@string/sb_skip_button_compact"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height"
android:focusable="true"
android:visibility="gone" />
<app.revanced.integrations.sponsorblock.ui.NewSegmentLayout
android:id="@+id/sb_new_segment_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_marginRight="20dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/brand_interaction_default_bottom_margin"
android:focusable="true"
android:visibility="gone" />
</merge>

35
src/main/resources/youtube/sponsorblock/outline/layout/skip_sponsor_button.xml
View File

@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:yt="http://schemas.android.com/apk/res-auto">
<LinearLayout
android:id="@+id/sb_skip_sponsor_button_container"
android:layout_width="wrap_content"
android:layout_height="32dp"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
android:padding="8dp">
<com.google.android.libraries.youtube.common.ui.YouTubeTextView
android:id="@+id/sb_skip_sponsor_button_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:includeFontPadding="false"
android:paddingRight="@dimen/ad_overlay_ad_text_padding"
android:singleLine="true"
android:text="@string/sb_skip_button_compact"
android:textColor="@color/skip_ad_button_foreground_color"
android:textSize="@dimen/extra_small_font_size"
yt:robotoFont="light" />
<ImageView
android:id="@+id/sb_skip_sponsor_button_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:alpha="0.8"
android:contentDescription="@null"
android:src="@drawable/quantum_ic_skip_next_white_24" />
</LinearLayout>
</merge>

0
src/main/resources/youtube/sponsorblock/default/layout/inline_sponsor_overlay.xml → src/main/resources/youtube/sponsorblock/shared/layout/inline_sponsor_overlay.xml
View File

0
src/main/resources/youtube/sponsorblock/default/layout/skip_sponsor_button.xml → src/main/resources/youtube/sponsorblock/shared/layout/skip_sponsor_button.xml
View File