ReVanced-Mirror/revanced-patches
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patches synced 2024-12-05 02:33:20 +01:00
Code Issues Projects Releases Wiki Activity

feat(youtube): sponsorblock improvements (#1557)

Browse Source 
Co-authored-by: oSumAtrIX <johan.melkonyan1@web.de>
This commit is contained in:
LisoUseInAIKyrios 2023-04-02 18:10:26 +04:00 committed by oSumAtrIX
parent 04a2accfe9
commit b5d712a332
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
10 changed files with 346 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/fingerprints/NextGenWatchLayoutFingerprint.kt
View File

@ -1,10 +0,0 @@
package app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
import org.jf.dexlib2.util.MethodUtil
object NextGenWatchLayoutFingerprint : MethodFingerprint(
"V", // constructors return void, in favour of speed of matching, this fingerprint has been added
customFingerprint = { methodDef -> MethodUtil.isConstructor(methodDef) && methodDef.parameterTypes.size == 3 && methodDef.definingClass.endsWith("NextGenWatchLayout;") }
)

74
src/main/kotlin/app/revanced/patches/youtube/layout/sponsorblock/bytecode/patch/SponsorBlockBytecodePatch.kt
View File

@ -1,5 +1,6 @@
package app.revanced.patches.youtube.layout.sponsorblock.bytecode.patch package app.revanced.patches.youtube.layout.sponsorblock.bytecode.patch
import app.revanced.extensions.toErrorResult
import app.revanced.patcher.annotation.Description import app.revanced.patcher.annotation.Description
import app.revanced.patcher.annotation.Name import app.revanced.patcher.annotation.Name
import app.revanced.patcher.annotation.Version import app.revanced.patcher.annotation.Version
@ -22,10 +23,13 @@ import app.revanced.patches.shared.mapping.misc.patch.ResourceMappingPatch
import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility import app.revanced.patches.youtube.layout.sponsorblock.annotations.SponsorBlockCompatibility
import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.* import app.revanced.patches.youtube.layout.sponsorblock.bytecode.fingerprints.*
import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch import app.revanced.patches.youtube.layout.sponsorblock.resource.patch.SponsorBlockResourcePatch
import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatFingerprint
import app.revanced.patches.youtube.misc.autorepeat.fingerprints.AutoRepeatParentFingerprint
import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch import app.revanced.patches.youtube.misc.integrations.patch.IntegrationsPatch
import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch import app.revanced.patches.youtube.misc.playercontrols.bytecode.patch.PlayerControlsBytecodePatch
import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch import app.revanced.patches.youtube.misc.playertype.patch.PlayerTypeHookPatch
import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch import app.revanced.patches.youtube.misc.video.information.patch.VideoInformationPatch
import app.revanced.patches.youtube.misc.video.speed.remember.patch.RememberPlaybackSpeedPatch
import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch import app.revanced.patches.youtube.misc.video.videoid.patch.VideoIdPatch
import org.jf.dexlib2.Opcode import org.jf.dexlib2.Opcode
import org.jf.dexlib2.iface.instruction.* import org.jf.dexlib2.iface.instruction.*
@ -38,11 +42,12 @@ import org.jf.dexlib2.iface.reference.StringReference
@DependsOn( @DependsOn(
dependencies = [ dependencies = [
VideoInformationPatch::class, // updates video information and adds method to seek in video VideoInformationPatch::class, // updates video information and adds method to seek in video
VideoIdPatch::class,
PlayerControlsBytecodePatch::class, PlayerControlsBytecodePatch::class,
PlayerTypeHookPatch::class, PlayerTypeHookPatch::class,
RememberPlaybackSpeedPatch::class,
IntegrationsPatch::class, IntegrationsPatch::class,
SponsorBlockResourcePatch::class, SponsorBlockResourcePatch::class,
VideoIdPatch::class
] ]
) )
@Name("sponsorblock") @Name("sponsorblock")
@ -52,15 +57,21 @@ import org.jf.dexlib2.iface.reference.StringReference
class SponsorBlockBytecodePatch : BytecodePatch( class SponsorBlockBytecodePatch : BytecodePatch(
listOf( listOf(
SeekbarFingerprint, SeekbarFingerprint,
NextGenWatchLayoutFingerprint,
AppendTimeFingerprint, AppendTimeFingerprint,
PlayerOverlaysLayoutInitFingerprint, PlayerOverlaysLayoutInitFingerprint,
AutoRepeatParentFingerprint,
) )
) { ) {
private companion object { private companion object {
const val INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR = const val INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR =
"Lapp/revanced/integrations/sponsorblock/PlayerController;" "Lapp/revanced/integrations/sponsorblock/SegmentPlaybackController;"
const val INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR =
"Lapp/revanced/integrations/sponsorblock/ui/CreateSegmentButtonController;"
const val INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR =
"Lapp/revanced/integrations/sponsorblock/ui/VotingButtonController;"
const val INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR =
"Lapp/revanced/integrations/sponsorblock/ui/SponsorBlockViewController;"
} }
override fun execute(context: BytecodeContext): PatchResult { override fun execute(context: BytecodeContext): PatchResult {
@ -69,19 +80,15 @@ class SponsorBlockBytecodePatch : BytecodePatch(
*/ */
with(VideoInformationPatch) { with(VideoInformationPatch) {
videoTimeHook( videoTimeHook(
INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR, INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR,
"setVideoTime" "setVideoTime"
) )
highPrecisionTimeHook(
INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR,
"setHighPrecisionVideoTime"
)
} }
/* /*
Set current video id Set current video id
*/ */
VideoIdPatch.injectCallBackgroundPlay("$INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V") VideoIdPatch.injectCallBackgroundPlay("$INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
/* /*
Seekbar drawing Seekbar drawing
@ -99,7 +106,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
if (instruction.opcode != Opcode.MOVE_OBJECT_FROM16) continue if (instruction.opcode != Opcode.MOVE_OBJECT_FROM16) continue
seekbarMethod.addInstruction( seekbarMethod.addInstruction(
index + 1, index + 1,
"invoke-static/range {p0 .. p0}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarRect(Ljava/lang/Object;)V" "invoke-static/range {p0 .. p0}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarRect(Ljava/lang/Object;)V"
) )
break break
} }
@ -115,7 +122,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
// set the thickness of the segment // set the thickness of the segment
seekbarMethod.addInstruction( seekbarMethod.addInstruction(
insertIndex, insertIndex,
"invoke-static {v${invokeInstruction.registerC}}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarThickness(I)V" "invoke-static {v${invokeInstruction.registerC}}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarThickness(I)V"
) )
break break
} }
@ -136,11 +143,11 @@ class SponsorBlockBytecodePatch : BytecodePatch(
// the reason for that is that we get the index, add instructions and then the offset would be wrong // the reason for that is that we get the index, add instructions and then the offset would be wrong
seekbarMethod.addInstruction( seekbarMethod.addInstruction(
indexLeft + 1, indexLeft + 1,
"invoke-static {v$rectangleLeftRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteLeft(Landroid/graphics/Rect;)V" "invoke-static {v$rectangleLeftRegister}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteLeft(Landroid/graphics/Rect;)V"
) )
seekbarMethod.addInstruction( seekbarMethod.addInstruction(
indexRight + 1, indexRight + 1,
"invoke-static {v$rectangleRightRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteRight(Landroid/graphics/Rect;)V" "invoke-static {v$rectangleRightRegister}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->setSponsorBarAbsoluteRight(Landroid/graphics/Rect;)V"
) )
/* /*
@ -152,7 +159,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
} }
seekbarMethod.addInstruction( seekbarMethod.addInstruction(
drawSegmentInstructionInsertIndex, drawSegmentInstructionInsertIndex,
"invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V" "invoke-static {v$canvasInstance, v$centerY}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->drawSponsorTimeBars(Landroid/graphics/Canvas;F)V"
) )
/* /*
@ -181,8 +188,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
method.addInstructions( method.addInstructions(
moveResultInstructionIndex + 1, // insert right after moving the view to the register and use that register moveResultInstructionIndex + 1, // insert right after moving the view to the register and use that register
""" """
invoke-static {v$inflatedViewRegister}, Lapp/revanced/integrations/sponsorblock/ShieldButton;->initialize(Ljava/lang/Object;)V invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V
invoke-static {v$inflatedViewRegister}, Lapp/revanced/integrations/sponsorblock/VotingButton;->initialize(Ljava/lang/Object;)V invoke-static {v$inflatedViewRegister}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V
""" """
) )
} }
@ -193,8 +200,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
// change visibility of the buttons // change visibility of the buttons
invertVisibilityMethod.addInstructions( invertVisibilityMethod.addInstructions(
0, """ 0, """
invoke-static {p1}, Lapp/revanced/integrations/sponsorblock/ShieldButton;->changeVisibilityNegatedImmediate(Z)V invoke-static {p1}, $INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediate(Z)V
invoke-static {p1}, Lapp/revanced/integrations/sponsorblock/VotingButton;->changeVisibilityNegatedImmediate(Z)V invoke-static {p1}, $INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibilityNegatedImmediate(Z)V
""".trimIndent() """.trimIndent()
) )
} }
@ -203,15 +210,8 @@ class SponsorBlockBytecodePatch : BytecodePatch(
} }
// change visibility of the buttons // change visibility of the buttons
PlayerControlsBytecodePatch.injectVisibilityCheckCall("Lapp/revanced/integrations/sponsorblock/ShieldButton;->changeVisibility(Z)V") PlayerControlsBytecodePatch.injectVisibilityCheckCall("$INTEGRATIONS_CREATE_SEGMENT_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibility(Z)V")
PlayerControlsBytecodePatch.injectVisibilityCheckCall("Lapp/revanced/integrations/sponsorblock/VotingButton;->changeVisibility(Z)V") PlayerControlsBytecodePatch.injectVisibilityCheckCall("$INTEGRATIONS_VOTING_BUTTON_CONTROLLER_CLASS_DESCRIPTOR->changeVisibility(Z)V")
// set SegmentHelperLayout.context to the player layout instance
val instanceRegister = 0
NextGenWatchLayoutFingerprint.result!!.mutableMethod.addInstruction(
3, // after super call
"invoke-static/range {p$instanceRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->addSkipSponsorView15(Landroid/view/View;)V"
)
// append the new time to the player layout // append the new time to the player layout
val appendTimeFingerprintResult = AppendTimeFingerprint.result!! val appendTimeFingerprintResult = AppendTimeFingerprint.result!!
@ -221,18 +221,18 @@ class SponsorBlockBytecodePatch : BytecodePatch(
appendTimeFingerprintResult.mutableMethod.addInstructions( appendTimeFingerprintResult.mutableMethod.addInstructions(
appendTimePatternScanStartIndex + 2, """ appendTimePatternScanStartIndex + 2, """
invoke-static {v$targetRegister}, Lapp/revanced/integrations/sponsorblock/SponsorBlockUtils;->appendTimeWithoutSegments(Ljava/lang/String;)Ljava/lang/String; invoke-static {v$targetRegister}, $INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR->appendTimeWithoutSegments(Ljava/lang/String;)Ljava/lang/String;
move-result-object v$targetRegister move-result-object v$targetRegister
""" """
) )
// initialize the player controller // initialize the player controller
VideoInformationPatch.onCreateHook(INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR, "initialize") VideoInformationPatch.onCreateHook(INTEGRATIONS_SEGMENT_PLAYBACK_CONTROLLER_CLASS_DESCRIPTOR, "initialize")
// initialize the sponsorblock view // initialize the sponsorblock view
PlayerOverlaysLayoutInitFingerprint.result!!.mutableMethod.addInstruction( PlayerOverlaysLayoutInitFingerprint.result!!.mutableMethod.addInstruction(
6, // after inflating the view 6, // after inflating the view
"invoke-static {p0}, Lapp/revanced/integrations/sponsorblock/player/ui/SponsorBlockView;->initialize(Ljava/lang/Object;)V" "invoke-static {p0}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->initialize(Ljava/lang/Object;)V"
) )
// get rectangle field name // get rectangle field name
@ -244,7 +244,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
// replace the "replaceMeWith*" strings // replace the "replaceMeWith*" strings
context context
.proxy(context.classes.first { it.type.endsWith("PlayerController;") }) .proxy(context.classes.first { it.type.endsWith("SegmentPlaybackController;") })
.mutableClass .mutableClass
.methods .methods
.find { it.name == "setSponsorBarRect" } .find { it.name == "setSponsorBarRect" }
@ -268,6 +268,16 @@ class SponsorBlockBytecodePatch : BytecodePatch(
} }
} ?: return PatchResultError("Could not find the method which contains the replaceMeWith* strings") } ?: return PatchResultError("Could not find the method which contains the replaceMeWith* strings")
// detect end of the video has been reached
AutoRepeatParentFingerprint.result ?: return AutoRepeatParentFingerprint.toErrorResult()
AutoRepeatFingerprint.also {
it.resolve(context, AutoRepeatParentFingerprint.result!!.classDef)
}.result?.mutableMethod?.addInstruction(
0,
"invoke-static {}, $INTEGRATIONS_SPONSORBLOCK_VIEW_CONTROLLER_CLASS_DESCRIPTOR->endOfVideoReached()V"
) ?: return AutoRepeatFingerprint.toErrorResult()
// TODO: isSBChannelWhitelisting implementation // TODO: isSBChannelWhitelisting implementation
return PatchResultSuccess() return PatchResultSuccess()

5
src/main/kotlin/app/revanced/patches/youtube/misc/video/information/patch/VideoInformationPatch.kt
View File

@ -122,7 +122,7 @@ class VideoInformationPatch : BytecodePatch(
/* /*
Hook the methods which set the time Hook the methods which set the time
*/ */
highPrecisionTimeHook(INTEGRATIONS_CLASS_DESCRIPTOR, "setVideoTime") highPrecisionTimeHook(INTEGRATIONS_CLASS_DESCRIPTOR, "setVideoTimeHighPrecision")
return PatchResultSuccess() return PatchResultSuccess()
} }
@ -155,6 +155,7 @@ class VideoInformationPatch : BytecodePatch(
/** /**
* Hook the video time. * Hook the video time.
* The hook is usually called once per second.
* *
* @param targetMethodClass The descriptor for the static method to invoke when the player controller is created. * @param targetMethodClass The descriptor for the static method to invoke when the player controller is created.
* @param targetMethodName The name of the static method to invoke when the player controller is created. * @param targetMethodName The name of the static method to invoke when the player controller is created.
@ -167,6 +168,8 @@ class VideoInformationPatch : BytecodePatch(
/** /**
* Hook the high precision video time. * Hook the high precision video time.
* The hooks is called extremely often (10 to 15 times a seconds), so use with caution.
* Note: the hook is usually called _off_ the main thread
* *
* @param targetMethodClass The descriptor for the static method to invoke when the player controller is created. * @param targetMethodClass The descriptor for the static method to invoke when the player controller is created.
* @param targetMethodName The name of the static method to invoke when the player controller is created. * @param targetMethodName The name of the static method to invoke when the player controller is created.

1
src/main/resources/returnyoutubedislike/host/values/strings.xml
View File

@ -21,6 +21,7 @@
<string name="revanced_ryd_compact_layout_summary_on">Like button styled for minimum width</string> <string name="revanced_ryd_compact_layout_summary_on">Like button styled for minimum width</string>
<string name="revanced_ryd_compact_layout_summary_off">Like button styled for best appearance</string> <string name="revanced_ryd_compact_layout_summary_off">Like button styled for best appearance</string>
<string name="revanced_ryd_about">About</string>
<string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string> <string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>
<string name="revanced_ryd_attribution_summary">Dislike data is provided by the Return YouTube Dislike API. Tap here to learn more.</string> <string name="revanced_ryd_attribution_summary">Dislike data is provided by the Return YouTube Dislike API. Tap here to learn more.</string>

10
src/main/resources/sponsorblock/drawable/ic_sb_voting.xml
View File

@ -1,9 +1,9 @@
<vector android:height="24dp" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:tint="#FFFFFF"
android:viewportHeight="24"
android:viewportWidth="24"
android:width="24dp" android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android"> android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path <path
android:fillColor="@android:color/white" android:fillColor="@android:color/white"
android:pathData="M12,6c0,-0.55 -0.45,-1 -1,-1L5.82,5l0.66,-3.18 0.02,-0.23c0,-0.31 -0.13,-0.59 -0.33,-0.8L5.38,0 0.44,4.94C0.17,5.21 0,5.59 0,6v6.5c0,0.83 0.67,1.5 1.5,1.5h6.75c0.62,0 1.15,-0.38 1.38,-0.91l2.26,-5.29c0.07,-0.17 0.11,-0.36 0.11,-0.55L12,6zM22.5,10h-6.75c-0.62,0 -1.15,0.38 -1.38,0.91l-2.26,5.29c-0.07,0.17 -0.11,0.36 -0.11,0.55L12,18c0,0.55 0.45,1 1,1h5.18l-0.66,3.18 -0.02,0.24c0,0.31 0.13,0.59 0.33,0.8l0.79,0.78 4.94,-4.94c0.27,-0.27 0.44,-0.65 0.44,-1.06v-6.5c0,-0.83 -0.67,-1.5 -1.5,-1.5z" /> android:pathData="M12,6c0,-0.55 -0.45,-1 -1,-1L5.82,5l0.66,-3.18 0.02,-0.23c0,-0.31 -0.13,-0.59 -0.33,-0.8L5.38,0 0.44,4.94C0.17,5.21 0,5.59 0,6v6.5c0,0.83 0.67,1.5 1.5,1.5h6.75c0.62,0 1.15,-0.38 1.38,-0.91l2.26,-5.29c0.07,-0.17 0.11,-0.36 0.11,-0.55L12,6zM22.5,10h-6.75c-0.62,0 -1.15,0.38 -1.38,0.91l-2.26,5.29c-0.07,0.17 -0.11,0.36 -0.11,0.55L12,18c0,0.55 0.45,1 1,1h5.18l-0.66,3.18 -0.02,0.24c0,0.31 0.13,0.59 0.33,0.8l0.79,0.78 4.94,-4.94c0.27,-0.27 0.44,-0.65 0.44,-1.06v-6.5c0,-0.83 -0.67,-1.5 -1.5,-1.5z" />

28
src/main/resources/sponsorblock/host/layout/youtube_controls_layout.xml
View File

@ -1,4 +1,28 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android">
<com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/sponsorblock_button" android:padding="@dimen/controls_overlay_action_button_padding" android:layout_width="@dimen/controls_overlay_action_button_size" android:layout_height="@dimen/controls_overlay_action_button_size" android:layout_marginTop="2dp" android:src="@drawable/ic_sb_logo" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="4dp" android:layout_toStartOf="@+id/player_additional_view_container" style="@style/YouTubePlayerButton"/>
<com.google.android.libraries.youtube.common.ui.TouchImageView android:id="@+id/voting_button" android:padding="@dimen/controls_overlay_action_button_padding" android:layout_width="@dimen/controls_overlay_action_button_size" android:layout_height="@dimen/controls_overlay_action_button_size" android:layout_marginTop="2dp" android:src="@drawable/ic_sb_voting" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="4dp" android:layout_toStartOf="@+id/sponsorblock_button" style="@style/YouTubePlayerButton"/> <com.google.android.libraries.youtube.common.ui.TouchImageView
android:id="@+id/sb_sponsorblock_button"
style="@style/YouTubePlayerButton"
android:layout_width="@dimen/controls_overlay_action_button_size"
android:layout_height="@dimen/controls_overlay_action_button_size"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentTop="true"
android:layout_marginTop="2dp"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@+id/player_additional_view_container"
android:padding="@dimen/controls_overlay_action_button_padding"
android:src="@drawable/ic_sb_logo" />
<com.google.android.libraries.youtube.common.ui.TouchImageView
android:id="@+id/sb_voting_button"
style="@style/YouTubePlayerButton"
android:layout_width="@dimen/controls_overlay_action_button_size"
android:layout_height="@dimen/controls_overlay_action_button_size"
android:layout_alignWithParentIfMissing="true"
android:layout_alignParentTop="true"
android:layout_marginTop="2dp"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@+id/sb_sponsorblock_button"
android:padding="@dimen/controls_overlay_action_button_padding"
android:src="@drawable/ic_sb_voting" />
</RelativeLayout> </RelativeLayout>

291
src/main/resources/sponsorblock/host/values/strings.xml
View File

@ -1,142 +1,173 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<string name="enable_sb">Enable SponsorBlock</string> <string name="sb_enable_sb">Enable SponsorBlock</string>
<string name="enable_sb_sum">SponsorBlock is a crowd-sourced system for skipping annoying parts in YouTube videos</string> <string name="sb_enable_sb_sum">SponsorBlock is a crowd-sourced system for skipping annoying parts of YouTube videos</string>
<string name="enable_segmadding">Enable new segment adding</string> <string name="sb_enable_voting">Show voting button</string>
<string name="enable_segmadding_sum">Switch this on to enable experimental segment adding (has button visibility issues)</string> <string name="sb_enable_voting_sum_on">Segment voting button is shown</string>
<string name="diff_segments">What to do with different segments</string> <string name="sb_enable_voting_sum_off">Segment voting button is not shown</string>
<string name="general">General</string> <string name="sb_enable_create_segment">Show create new segment button</string>
<string name="general_skiptoast">Show a toast when skipping segment automatically</string> <string name="sb_enable_create_segment_sum_on">Create new segment button is shown</string>
<string name="general_skiptoast_sum">Click to see an example toast</string> <string name="sb_enable_create_segment_sum_off">Create new segment button is not shown</string>
<string name="general_skipcount">Skip count tracking</string> <string name="sb_enable_compact_skip_button">Use compact skip button</string>
<string name="general_skipcount_sum">This lets SponsorBlock leaderboard system know how much time people have saved. The extension sends a message to the server each time you skip a segment</string> <string name="sb_enable_compact_skip_button_sum_on">Skip button styled for minimum width</string>
<string name="general_adjusting">Adjusting new segment step</string> <string name="sb_enable_compact_skip_button_sum_off">Skip button styled for best appearance</string>
<string name="general_adjusting_sum">This is the number of milliseconds you can move when you use the time adjustment buttons while adding new segment</string> <string name="sb_diff_segments">What to do with different segments</string>
<string name="general_min_duration">Minimum segment duration</string> <string name="sb_general">General</string>
<string name="general_min_duration_sum">Segments shorter than the set value (in seconds) will not be skipped or shown in the player</string> <string name="sb_general_skiptoast">Show a toast when skipping segment automatically</string>
<string name="general_uuid">Your private user id</string> <string name="sb_general_skiptoast_sum_on">Toast shown when a segment is automatically skipped. Tap here to see an example</string>
<string name="general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string> <string name="sb_general_skiptoast_sum_off">Toast not shown. Tap here to see an example</string>
<string name="settings_ie">Import/Export settings</string> <string name="sb_general_skipcount">Enable skip count tracking</string>
<string name="settings_ie_sum">This is your entire configuration that is applicable in the desktop extension in JSON. This includes your Private userID, so be sure to share this wisely.</string> <string name="sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
<string name="general_api_url">Change API URL</string> <string name="sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
<string name="general_api_url_sum">The address SponsorBlock uses to make calls to the server. &lt;b>Don\'t change this unless you know what you\'re doing.&lt;/b></string> <string name="sb_general_time_without">Show video length without segments</string>
<string name="settings_import_successful">Settings were successfully imported</string> <string name="sb_general_time_without_sum_on">Video length minus all segments, shown in parentheses next to the full video length</string>
<string name="settings_import_failed">Failed to import settings</string> <string name="sb_general_time_without_sum_off">Full video length shown</string>
<string name="settings_export_failed">Failed to export settings</string> <string name="sb_general_adjusting">Adjust new segment step</string>
<string name="general_cache">Cache segments locally</string> <string name="sb_general_adjusting_sum">Number of milliseconds the time adjustment buttons move when creating new segments</string>
<string name="general_cache_sum">Frequently watched videos (eg. music videos) may store segments in app cache to make skipping segments faster</string> <string name="sb_general_adjusting_invalid">Value must be a positive number</string>
<string name="general_cache_clear">Clear SponsorBlock segments cache</string> <string name="sb_general_min_duration">Minimum segment duration</string>
<string name="segments_sponsor">Sponsor</string> <string name="sb_general_min_duration_sum">Segments shorter than this value (in seconds) will not be shown or skipped</string>
<string name="segments_sponsor_sum">Paid promotion, paid referrals and direct advertisements</string> <string name="sb_general_uuid">Your private user id</string>
<string name="segments_intermission">Intermission/Intro Animation</string> <string name="sb_general_uuid_sum">This should be kept private. This is like a password and should not be shared with anyone. If someone has this, they can impersonate you</string>
<string name="segments_intermission_sum">An interval without actual content. Could be a pause, static frame, repeating animation</string> <string name="sb_general_uuid_invalid">User id cannot be blank</string>
<string name="segments_endcards">Endcards/Credits</string> <string name="sb_settings_ie">Import/Export settings</string>
<string name="segments_endcards_sum">Credits or when the YouTube endcards appear. Not for spoken conclusions</string> <string name="sb_settings_ie_sum">Your SponsorBlock JSON configuration that can be imported/exported to ReVanced and other SponsorBlock platforms. This includes your private user id. Be sure to share this wisely</string>
<string name="segments_subscribe">Interaction Reminder (Subscribe)</string> <string name="sb_general_api_url">Change API URL</string>
<string name="segments_subscribe_sum">When there is a short reminder to like, subscribe, follow or interact with them on any free or paid platform</string> <string name="sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server. &lt;b>Don\'t change this unless you know what you\'re doing&lt;/b></string>
<string name="segments_selfpromo">Unpaid/Self Promotion</string> <string name="sb_settings_import_successful">Settings imported successfully</string>
<string name="segments_selfpromo_sum">When there is unpaid or self promotion. This includes specific sections about merchandise, donations, or information about who they collaborated with</string> <string name="sb_settings_import_failed">Failed to import: %s</string>
<string name="segments_nomusic">Music: Non-Music Section</string> <string name="sb_settings_export_failed">Failed to export settings (try clearing app data)</string>
<string name="segments_nomusic_sum">Only for use in music videos. Skips parts of the video not in official mixes</string>
<string name="segments_filler">Filler Tangent/Jokes</string>
<string name="segments_filler_sum">Tangential scenes added only for filler or humor that are not required to understand the main content of the video. This should not include context or background details</string>
<string name="skipped_segment">Skipped a sponsor segment</string>
<string name="skipped_sponsor">Skipped sponsor</string>
<string name="skipped_intermission">Skipped intro</string>
<string name="skipped_endcard">Skipped outro</string>
<string name="skipped_subscribe">Skipped annoying reminder</string>
<string name="skipped_selfpromo">Skipped self promotion</string>
<string name="skipped_nomusic">Skipped a non-music section</string>
<string name="skipped_preview">Skipped preview</string>
<string name="skipped_filler">Skipped filler</string>
<string name="skipped_unsubmitted">Skipped unsubmitted segment</string>
<string name="skip_automatically">Skip automatically</string>
<string name="skip_automatically_once">Skip automatically once</string>
<string name="skip_showbutton">Show a skip button</string>
<string name="skip_ignore">Don\'t do anything</string>
<string name="skip_sponsor">Skip segment</string>
<string name="about">About</string>
<string name="about_api">This app uses the API from SponsorBlock</string>
<string name="about_api_sum">Tap to learn more, and see downloads for other platforms at: sponsor.ajay.app</string>
<string name="about_madeby">Integration made by JakubWeg, recoded by oSumAtrIX</string>
<string name="tap_skip">Tap to skip</string>
<string name="submit_failed_invalid">Can\'t submit the segment: %s</string> <string name="sb_segments_sponsor">Sponsor</string>
<string name="submit_failed_unknown_error" formatted="false">Unable to submit segments: Status: %d %s</string> <string name="sb_segments_sponsor_sum">Paid promotion, paid referrals and direct advertisements. Not for self-promotion or free shout-outs to causes/creators/websites/products they like</string>
<string name="submit_failed_rate_limit">Can\'t submit the segment.\nRate Limited (Too many from the same user or IP)</string> <string name="sb_segments_selfpromo">Unpaid/Self Promotion</string>
<string name="submit_failed_forbidden" formatted="false">Can\'t submit the segment.\n\n%s</string> <string name="sb_segments_selfpromo_sum">Similar to \'Sponsor\' except for unpaid or self promotion. Includes sections about merchandise, donations, or information about who they collaborated with</string>
<string name="submit_failed_duplicate">Can\'t submit the segment.\nAlready exists</string> <string name="sb_segments_interaction">Interaction Reminder (Subscribe)</string>
<string name="submit_succeeded">Segment submitted successfully</string> <string name="sb_segments_interaction_sum">A short reminder to like, subscribe or follow them in the middle of content. If it is long or about something specific, it should instead be under self promotion</string>
<string name="submit_started">Submitting segment…</string> <string name="sb_segments_intro">Intermission/Intro Animation</string>
<string name="sb_segments_intro_sum">An interval without actual content. Could be a pause, static frame, or repeating animation. Does not include transitions containing information</string>
<string name="sb_segments_outro">Endcards/Credits</string>
<string name="sb_segments_outro_sum">Credits or when the YouTube endcards appear. Not for conclusions with information</string>
<string name="sb_segments_preview">Preview/Recap</string>
<string name="sb_segments_preview_sum">Collection of clips that show what is coming up or what happened in the video or in other videos of a series, where all information is repeated elsewhere</string>
<string name="sb_segments_filler">Filler Tangent/Jokes</string>
<string name="sb_segments_filler_sum">Tangential scenes added only for filler or humor that are not required to understand the main content of the video. Does not include segments providing context or background details</string>
<string name="sb_segments_nomusic">Music: Non-Music Section</string>
<string name="sb_segments_nomusic_sum">Only for use in music videos. Sections of music videos without music, that aren\'t already covered by another category</string>
<string name="vote_failed_unknown_error" formatted="false">Unable to vote for segment: Status: %d %s</string> <string name="sb_skip_button_compact">Skip</string>
<string name="vote_failed_rate_limit">Can\'t vote for segment.\nRate Limited (Too many from the same user or IP)</string> <string name="sb_skip_button_sponsor">Skip sponsor</string>
<string name="vote_failed_forbidden" formatted="false">Can\'t vote for segment.\n\n%s</string> <string name="sb_skip_button_selfpromo">Skip promo</string>
<string name="vote_succeeded">Voted successfully</string> <string name="sb_skip_button_interaction">Skip interact</string>
<string name="vote_started">Voting for segment…</string> <string name="sb_skip_button_intro_beginning">Skip intro</string>
<string name="vote_upvote">Upvote</string> <string name="sb_skip_button_intro_middle">Skip intermission</string>
<string name="vote_downvote">Downvote</string> <string name="sb_skip_button_intro_end">Skip intermission</string>
<string name="vote_category">Change category</string> <string name="sb_skip_button_outro">Skip outro</string>
<string name="vote_no_segments">There are no segments to vote for</string> <string name="sb_skip_button_preview_beginning">Skip preview</string>
<string name="enable_voting">Enable voting</string> <string name="sb_skip_button_preview_middle">Skip preview</string>
<string name="enable_voting_sum">Switch this on to enable voting.</string> <string name="sb_skip_button_preview_end">Skip recap</string>
<string name="sb_skip_button_filler">Skip filler</string>
<string name="sb_skip_button_nomusic">Skip non-music</string>
<string name="sb_skip_button_unsubmitted">Skip segment</string>
<string name="new_segment_choose_category">Choose the segment category</string> <string name="sb_skipped_sponsor">Skipped sponsor</string>
<string name="new_segment_disabled_category">You\'ve disabled this category in the settings, enable it to be able to submit</string> <string name="sb_skipped_selfpromo">Skipped self promotion</string>
<string name="new_segment_title">New SponsorBlock segment</string> <string name="sb_skipped_interaction">Skipped annoying reminder</string>
<string name="new_segment_mark_time_as_question" formatted="false">Set %02d:%02d:%04d as the start or end of a new segment?</string> <string name="sb_skipped_intro_beginning">Skipped intro</string>
<string name="new_segment_mark_start">start</string> <string name="sb_skipped_intro_middle">Skipped intermission</string>
<string name="new_segment_mark_end">end</string> <string name="sb_skipped_intro_end">Skipped intermission</string>
<string name="new_segment_now">now</string> <string name="sb_skipped_outro">Skipped outro</string>
<string name="new_segment_time_start">Time the segment begins at</string> <string name="sb_skipped_preview_beginning">Skipped preview</string>
<string name="new_segment_time_end">Time the segment ends at</string> <string name="sb_skipped_preview_middle">Skipped preview</string>
<string name="new_segment_time_start_set">Beginning of segment set</string> <string name="sb_skipped_preview_end">Skipped recap</string>
<string name="new_segment_time_end_set">End of segment set</string> <string name="sb_skipped_filler">Skipped filler</string>
<string name="new_segment_confirm_title">Are the times correct?</string> <string name="sb_skipped_nomusic">Skipped a non-music section</string>
<string name="new_segment_confirm_content" formatted="false">The segment lasts from %02d:%02d to %02d:%02d (%d minutes %02d seconds)\nIs it ready to submit?</string> <string name="sb_skipped_unsubmitted">Skipped unsubmitted segment</string>
<string name="new_segment_mark_locations_first">Mark two locations on the time bar first</string> <string name="sb_skipped_multiple_segments">Skipped multiple segments</string>
<string name="new_segment_edit_by_hand_title">Edit timing of segment manually</string>
<string name="new_segment_edit_by_hand_content">Do you want to edit the timing for the start or end of the segment?</string> <string name="sb_skip_automatically">Skip automatically</string>
<string name="new_segment_edit_by_hand_saved">Done</string> <string name="sb_skip_automatically_once">Skip automatically once</string>
<string name="new_segment_edit_by_hand_parse_error">Invalid time given</string> <string name="sb_skip_showbutton">Show a skip button</string>
<string name="sb_skip_seekbaronly">Show in seek bar</string>
<string name="sb_skip_ignore">Disable</string>
<string name="sb_about">About</string>
<string name="sb_about_api">Sponsor.Ajay.app</string>
<string name="sb_about_api_sum">Data is provided by the SponsorBlock API. Tap here to learn more and see downloads for other platforms</string>
<string name="sb_about_made_by">ReVanced integration by JakubWeg,\nrecoded by oSumAtrIX</string>
<string name="sb_submit_failed_invalid" formatted="false">Can\'t submit the segment: %s</string>
<string name="sb_submit_failed_timeout">Unable to submit segments (API timed out)</string>
<string name="sb_submit_failed_unknown_error" formatted="false">Unable to submit segments (status: %d %s)</string>
<string name="sb_submit_failed_rate_limit">Can\'t submit the segment.\nRate Limited (too many from the same user or IP)</string>
<string name="sb_submit_failed_forbidden" formatted="false">Can\'t submit the segment: %s</string>
<string name="sb_submit_failed_duplicate">Can\'t submit the segment.\nAlready exists</string>
<string name="sb_submit_succeeded">Segment submitted successfully</string>
<string name="sb_sponsorblock_connection_failure_generic">SponsorBlock temporarily not available</string>
<string name="sb_sponsorblock_connection_failure_status" formatted="false">SponsorBlock temporarily not available (status %d)</string>
<string name="sb_sponsorblock_connection_failure_timeout">SponsorBlock temporarily not available (API timed out)</string>
<string name="sb_vote_failed_timeout">Unable to vote for segment (API timed out)</string>
<string name="sb_vote_failed_unknown_error" formatted="false">Unable to vote for segment (status: %d %s)</string>
<string name="sb_vote_failed_forbidden" formatted="false">Unable to vote for segment: %s</string>
<string name="sb_vote_upvote">Upvote</string>
<string name="sb_vote_downvote">Downvote</string>
<string name="sb_vote_category">Change category</string>
<string name="sb_vote_no_segments">There are no segments to vote for</string>
<string name="sb_new_segment_choose_category">Choose the segment category</string>
<string name="sb_new_segment_disabled_category">Category is disabled in settings. Enable category to submit.</string>
<string name="sb_new_segment_title">New SponsorBlock segment</string>
<string name="sb_new_segment_mark_time_as_question" formatted="false">Set %02d:%02d:%04d as the start or end of a new segment?</string>
<string name="sb_new_segment_mark_start">start</string>
<string name="sb_new_segment_mark_end">end</string>
<string name="sb_new_segment_now">now</string>
<string name="sb_new_segment_time_start">Time the segment begins at</string>
<string name="sb_new_segment_time_end">Time the segment ends at</string>
<string name="sb_new_segment_confirm_title">Are the times correct?</string>
<string name="sb_new_segment_confirm_content" formatted="false">The segment lasts from %02d:%02d to %02d:%02d (%d minutes %02d seconds)\nIs it ready to submit?</string>
<string name="sb_new_segment_mark_locations_first">Mark two locations on the time bar first</string>
<string name="sb_new_segment_preview_segment_first">Preview the segment, and ensure it skips smoothly</string>
<string name="sb_new_segment_edit_by_hand_title">Edit timing of segment manually</string>
<string name="sb_new_segment_edit_by_hand_content">Do you want to edit the timing for the start or end of the segment?</string>
<string name="sb_new_segment_edit_by_hand_parse_error">Invalid time given</string>
<string name="sb_guidelines_preference_title">View guidelines</string> <string name="sb_guidelines_preference_title">View guidelines</string>
<string name="sb_guidelines_preference_sum">Guidelines contain tips and rules about submitting segments</string> <string name="sb_guidelines_preference_sum">Guidelines contain rules and tips for creating new segments</string>
<string name="sb_guidelines_popup_title">There are guidelines</string> <string name="sb_guidelines_popup_title">Follow the guidelines</string>
<string name="sb_guidelines_popup_content">It\'s recommended to read the SponsorBlock guidelines before submitting any segment</string> <string name="sb_guidelines_popup_content">Read the SponsorBlock guidelines before creating new segments</string>
<string name="sb_guidelines_popup_already_read">Already read</string> <string name="sb_guidelines_popup_already_read">Already read</string>
<string name="sb_guidelines_popup_open">Show me</string> <string name="sb_guidelines_popup_open">Show me</string>
<string name="general_time_without_sb">Show time without segments</string> <string name="sb_stats">Stats</string>
<string name="general_time_without_sb_sum">This time appears in brackets next to the current time. This shows the total video duration minus any segments.</string> <string name="sb_stats_connection_failure">Stats temporarily not available (API is down)</string>
<string name="segments_preview">Preview/Recap</string> <string name="sb_stats_loading">Loading...</string>
<string name="segments_preview_sum">Recap of previous episodes, or a preview of what\'s coming up later in the current video or future videos in the same series. Clips should not provide additional information.</string> <string name="sb_stats_sb_disabled">SponsorBlock is disabled</string>
<string name="stats">Stats</string> <string name="sb_stats_username" formatted="false">Your username: &lt;b>%s&lt;/b></string>
<string name="stats_loading">Loading..</string> <string name="sb_stats_username_change">Tap here to change your username</string>
<string name="stats_sb_disabled">SponsorBlock is disabled</string> <string name="sb_stats_username_change_unknown_error" formatted="false">Unable to change username: Status: %d %s</string>
<string name="stats_username" formatted="false">Your username: &lt;b&gt;%s&lt;/b&gt;</string> <string name="sb_stats_username_changed">Username successfully changed</string>
<string name="stats_username_change">Click to change your username</string> <string name="sb_stats_reputation" formatted="false">You\'re reputation is &lt;b>%.2f&lt;/b></string>
<string name="stats_username_change_unknown_error" formatted="false">Unable to change username: Status: %d %s</string> <string name="sb_stats_submissions" formatted="false">You\'ve created &lt;b>%s&lt;/b> segments</string>
<string name="stats_username_changed">Username successfully changed</string> <string name="sb_stats_saved_zero">SponsorBlock leaderboard</string>
<string name="stats_submissions">Submissions: &lt;b&gt;%s&lt;/b&gt;</string> <string name="sb_stats_saved" formatted="false">You\'ve saved people from &lt;b>%s&lt;/b> segments</string>
<string name="stats_saved">You\'ve saved people from &lt;b&gt;%s&lt;/b&gt; segments.</string> <string name="sb_stats_saved_sum_zero">Tap here to see the global stats and top contributors</string>
<string name="stats_saved_sum">That\'s &lt;b&gt;%s&lt;/b&gt; of their lives. Click to see the leaderboard</string> <string name="sb_stats_saved_sum" formatted="false">That\'s &lt;b>%s&lt;/b> of their lives.&lt;br>Tap here to see the leaderboard</string>
<string name="stats_self_saved">You\'ve skipped &lt;b&gt;%s&lt;/b&gt; segments.</string> <string name="sb_stats_self_saved" formatted="false">You\'ve skipped &lt;b>%s&lt;/b> segments</string>
<string name="stats_self_saved_sum">That\'s &lt;b&gt;%s&lt;/b&gt;.</string> <string name="sb_stats_self_saved_sum" formatted="false">That\'s &lt;b>%s&lt;/b></string>
<string name="minutes">minutes</string> <string name="sb_stats_self_saved_reset_title">Reset skipped segments counter?</string>
<string name="color_change">Are you looking for changing colors?</string> <string name="sb_stats_saved_hour_format" formatted="false">%d hours %d minutes</string>
<string name="color_change_sum">You can now change a category\'s color by clicking on it above.</string> <string name="sb_stats_saved_minute_format" formatted="false">%d minutes %d seconds</string>
<string name="color_choose_category">Choose the category</string> <string name="sb_stats_saved_second_format" formatted="false">%d seconds</string>
<string name="color_changed">Color changed</string> <string name="sb_color_dot_label">Color:</string>
<string name="color_reset">Color reset</string> <string name="sb_color_changed">Color changed</string>
<string name="color_invalid">Invalid hex code</string> <string name="sb_color_reset">Color reset</string>
<string name="change">Change</string> <string name="sb_color_invalid">Invalid color code</string>
<string name="reset">Reset</string> <string name="sb_reset_color">Reset color</string>
<string name="action_segments">Segments</string> <string name="sb_reset">Reset</string>
<string name="action_browser">SB Browser</string> <string name="sb_api_url_reset">API URL reset</string>
<string name="sb_api_url_invalid">API URL is invalid</string>
<string name="api_url_changed">API URL changed</string> <string name="sb_api_url_changed">API URL changed</string>
<string name="api_url_reset">API URL reset</string>
<string name="api_url_invalid">Provided API URL is invalid</string>
</resources> </resources>

22
src/main/resources/sponsorblock/layout/inline_sponsor_overlay.xml
View File

@ -1,5 +1,23 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android"> <merge xmlns:android="http://schemas.android.com/apk/res/android">
<app.revanced.integrations.sponsorblock.player.ui.NewSegmentLayout android:id="@+id/new_segment_view" android:focusable="true" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/brand_interaction_default_bottom_margin" android:layout_alignParentLeft="true" android:layout_alignParentBottom="true"/>
<app.revanced.integrations.sponsorblock.player.ui.SkipSponsorButton android:id="@+id/skip_sponsor_button" android:focusable="true" android:visibility="gone" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/inline_controls_bottom_bar_height" android:layout_alignParentRight="true" android:layout_alignParentBottom="true"/> <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_alignParentLeft="true"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/brand_interaction_default_bottom_margin"
android:focusable="true"
android:visibility="gone" />
<app.revanced.integrations.sponsorblock.ui.SkipSponsorButton
android:id="@+id/sb_skip_sponsor_button"
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" />
</merge> </merge>

106
src/main/resources/sponsorblock/layout/new_segment.xml
View File

@ -3,58 +3,58 @@
xmlns:yt="http://schemas.android.com/apk/res-auto"> xmlns:yt="http://schemas.android.com/apk/res-auto">
<LinearLayout <LinearLayout
android:gravity="start|center" android:id="@+id/sb_new_segment_container"
android:orientation="vertical"
android:id="@+id/new_segment_container"
android:background="#66000000"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:background="#66000000"
android:gravity="start|center"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="36.0dip"> android:layout_height="36.0dip">
<ImageButton <ImageButton
android:layout_gravity="start|center" android:id="@+id/sb_new_segment_rewind"
android:id="@+id/new_segment_rewind"
android:background="@android:color/transparent"
android:paddingTop="3.0dip"
android:paddingBottom="3.0dip"
android:layout_width="45.0dip" android:layout_width="45.0dip"
android:layout_height="36.0dip" android:layout_height="36.0dip"
android:src="@drawable/player_fast_rewind" android:layout_gravity="start|center"
android:contentDescription="@null"
android:alpha="1.0" android:alpha="1.0"
android:background="@android:color/transparent"
android:contentDescription="@null"
android:paddingStart="10.0dip" android:paddingStart="10.0dip"
android:paddingEnd="5.0dip" /> android:paddingTop="3.0dip"
android:paddingEnd="5.0dip"
android:paddingBottom="3.0dip"
android:src="@drawable/player_fast_rewind" />
<ImageButton <ImageButton
android:layout_gravity="start|center" android:id="@+id/sb_new_segment_forward"
android:id="@+id/new_segment_forward"
android:background="@android:color/transparent"
android:paddingTop="3.0dip"
android:paddingBottom="3.0dip"
android:layout_width="45.0dip" android:layout_width="45.0dip"
android:layout_height="36.0dip" android:layout_height="36.0dip"
android:src="@drawable/player_fast_forward" android:layout_gravity="start|center"
android:contentDescription="@null"
android:alpha="1.0" android:alpha="1.0"
android:background="@android:color/transparent"
android:contentDescription="@null"
android:paddingStart="5.0dip" android:paddingStart="5.0dip"
android:paddingEnd="5.0dip" /> android:paddingTop="3.0dip"
android:paddingEnd="5.0dip"
android:paddingBottom="3.0dip"
android:src="@drawable/player_fast_forward" />
<ImageButton <ImageButton
android:layout_gravity="start|center" android:id="@+id/sb_new_segment_adjust"
android:id="@+id/new_segment_adjust"
android:background="@android:color/transparent"
android:paddingTop="3.0dip"
android:paddingBottom="3.0dip"
android:layout_width="45.0dip" android:layout_width="45.0dip"
android:layout_height="36.0dip" android:layout_height="36.0dip"
android:src="@drawable/ic_sb_adjust" android:layout_gravity="start|center"
android:contentDescription="@null"
android:alpha="1.0" android:alpha="1.0"
android:background="@android:color/transparent"
android:contentDescription="@null"
android:paddingStart="5.0dip" android:paddingStart="5.0dip"
android:paddingEnd="10.0dip" /> android:paddingTop="3.0dip"
android:paddingEnd="10.0dip"
android:paddingBottom="3.0dip"
android:src="@drawable/ic_sb_adjust" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@ -62,46 +62,46 @@
android:layout_height="36.0dip"> android:layout_height="36.0dip">
<ImageButton <ImageButton
android:layout_gravity="start|center" android:id="@+id/sb_new_segment_compare"
android:id="@+id/new_segment_compare"
android:background="@android:color/transparent"
android:paddingTop="3.0dip"
android:paddingBottom="3.0dip"
android:layout_width="45.0dip" android:layout_width="45.0dip"
android:layout_height="36.0dip" android:layout_height="36.0dip"
android:src="@drawable/ic_sb_compare" android:layout_gravity="start|center"
android:contentDescription="@null"
android:alpha="1.0" android:alpha="1.0"
android:background="@android:color/transparent"
android:contentDescription="@null"
android:paddingStart="10.0dip" android:paddingStart="10.0dip"
android:paddingEnd="5.0dip" /> android:paddingTop="3.0dip"
android:paddingEnd="5.0dip"
android:paddingBottom="3.0dip"
android:src="@drawable/ic_sb_compare" />
<ImageButton <ImageButton
android:layout_gravity="start|center" android:id="@+id/sb_new_segment_edit"
android:id="@+id/new_segment_edit"
android:background="@android:color/transparent"
android:paddingTop="3.0dip"
android:paddingBottom="3.0dip"
android:layout_width="45.0dip" android:layout_width="45.0dip"
android:layout_height="36.0dip" android:layout_height="36.0dip"
android:src="@drawable/ic_sb_edit" android:layout_gravity="start|center"
android:contentDescription="@null"
android:alpha="1.0" android:alpha="1.0"
android:background="@android:color/transparent"
android:contentDescription="@null"
android:paddingStart="5.0dip" android:paddingStart="5.0dip"
android:paddingEnd="5.0dip" /> android:paddingTop="3.0dip"
android:paddingEnd="5.0dip"
android:paddingBottom="3.0dip"
android:src="@drawable/ic_sb_edit" />
<ImageButton <ImageButton
android:layout_gravity="start|center" android:id="@+id/sb_new_segment_publish"
android:id="@+id/new_segment_publish"
android:background="@android:color/transparent"
android:paddingTop="3.0dip"
android:paddingBottom="3.0dip"
android:layout_width="45.0dip" android:layout_width="45.0dip"
android:layout_height="36.0dip" android:layout_height="36.0dip"
android:src="@drawable/ic_sb_publish" android:layout_gravity="start|center"
android:contentDescription="@null"
android:alpha="1.0" android:alpha="1.0"
android:background="@android:color/transparent"
android:contentDescription="@null"
android:paddingStart="5.0dip" android:paddingStart="5.0dip"
android:paddingEnd="10.0dip" /> android:paddingTop="3.0dip"
android:paddingEnd="10.0dip"
android:paddingBottom="3.0dip"
android:src="@drawable/ic_sb_publish" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</merge> </merge>

37
src/main/resources/sponsorblock/layout/skip_sponsor_button.xml
View File

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