mirror of
https://github.com/inotia00/revanced-patches.git
synced 2025-05-01 15:14:34 +02:00
refactor(sponsorblock): reflect the official ReVanced's source code
This commit is contained in:
inotia00
parent
e2fdf0eaf0
commit
aaecb59951
@ -1,9 +0,0 @@
|
||||
package app.revanced.patches.youtube.misc.sponsorblock.bytecode.fingerprints
|
||||
|
||||
import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
import org.jf.dexlib2.util.MethodUtil
|
||||
|
||||
object NextGenWatchLayoutFingerprint : MethodFingerprint(
|
||||
returnType = "V", // constructors return void, in favour of speed of matching, this fingerprint has been added
|
||||
customFingerprint = { MethodUtil.isConstructor(it) && it.parameterTypes.size == 3 && it.definingClass.endsWith("NextGenWatchLayout;") }
|
||||
)
|
||||
@ -4,7 +4,7 @@ import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
|
||||
|
||||
object PlayerControllerFingerprint : MethodFingerprint(
|
||||
customFingerprint = {
|
||||
it.definingClass == "Lapp/revanced/integrations/sponsorblock/PlayerController;"
|
||||
it.definingClass == "Lapp/revanced/integrations/sponsorblock/SegmentPlaybackController;"
|
||||
&& it.name == "setSponsorBarRect"
|
||||
}
|
||||
)
|
||||
|
||||
@ -43,7 +43,6 @@ import org.jf.dexlib2.iface.reference.MethodReference
|
||||
@Version("0.0.1")
|
||||
class SponsorBlockBytecodePatch : BytecodePatch(
|
||||
listOf(
|
||||
NextGenWatchLayoutFingerprint,
|
||||
PlayerControllerFingerprint
|
||||
)
|
||||
) {
|
||||
@ -57,16 +56,11 @@ class SponsorBlockBytecodePatch : BytecodePatch(
|
||||
INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR,
|
||||
"setVideoTime"
|
||||
)
|
||||
highPrecisionTimeHook(
|
||||
INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR,
|
||||
"setHighPrecisionVideoTime"
|
||||
)
|
||||
}
|
||||
|
||||
/*
|
||||
* Inject VideoIdPatch
|
||||
*/
|
||||
LegacyVideoIdPatch.injectCall("$INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
|
||||
MainstreamVideoIdPatch.injectCall("$INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->setCurrentVideoId(Ljava/lang/String;)V")
|
||||
|
||||
|
||||
@ -137,18 +131,11 @@ class SponsorBlockBytecodePatch : BytecodePatch(
|
||||
* Voting & Shield button
|
||||
*/
|
||||
|
||||
arrayOf("ShieldButton", "VotingButton").forEach {
|
||||
PlayerControlsPatch.initializeSB("$INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR/$it;")
|
||||
PlayerControlsPatch.injectVisibility("$INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR/$it;")
|
||||
arrayOf("CreateSegmentButtonController", "VotingButtonController").forEach {
|
||||
PlayerControlsPatch.initializeSB("$INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR/ui/$it;")
|
||||
PlayerControlsPatch.injectVisibility("$INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR/ui/$it;")
|
||||
}
|
||||
|
||||
// set SegmentHelperLayout.context to the player layout instance
|
||||
val instanceRegister = 0
|
||||
NextGenWatchLayoutFingerprint.result?.mutableMethod?.addInstruction(
|
||||
3,
|
||||
"invoke-static/range {p$instanceRegister}, $INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR->addSkipSponsorView15(Landroid/view/View;)V"
|
||||
) ?: return NextGenWatchLayoutFingerprint.toErrorResult()
|
||||
|
||||
|
||||
/*
|
||||
* Replace strings
|
||||
@ -178,7 +165,7 @@ class SponsorBlockBytecodePatch : BytecodePatch(
|
||||
"Lapp/revanced/integrations/sponsorblock"
|
||||
|
||||
const val INTEGRATIONS_PLAYER_CONTROLLER_CLASS_DESCRIPTOR =
|
||||
"$INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR/PlayerController;"
|
||||
"$INTEGRATIONS_BUTTON_CLASS_DESCRIPTOR/SegmentPlaybackController;"
|
||||
|
||||
lateinit var insertMethod: MutableMethod
|
||||
lateinit var insertInstructions: List<BuilderInstruction>
|
||||
|
||||
@ -49,7 +49,7 @@ class SponsorBlockSecondaryBytecodePatch : BytecodePatch() {
|
||||
|
||||
mutableMethod.addInstructions(
|
||||
targetIndex + 1, """
|
||||
invoke-static {v$targetRegister}, Lapp/revanced/integrations/sponsorblock/SponsorBlockUtils;->appendTimeWithoutSegments(Ljava/lang/String;)Ljava/lang/String;
|
||||
invoke-static {v$targetRegister}, Lapp/revanced/integrations/sponsorblock/SegmentPlaybackController;->appendTimeWithoutSegments(Ljava/lang/String;)Ljava/lang/String;
|
||||
move-result-object v$targetRegister
|
||||
"""
|
||||
)
|
||||
@ -66,7 +66,7 @@ class SponsorBlockSecondaryBytecodePatch : BytecodePatch() {
|
||||
|
||||
mutableMethod.addInstruction(
|
||||
insertIndex,
|
||||
"invoke-static {p0}, Lapp/revanced/integrations/sponsorblock/player/ui/SponsorBlockView;->initialize(Ljava/lang/Object;)V"
|
||||
"invoke-static {p0}, Lapp/revanced/integrations/sponsorblock/ui/SponsorBlockViewController;->initialize(Ljava/lang/Object;)V"
|
||||
)
|
||||
|
||||
patchSuccessArray[1] = true
|
||||
|
||||
@ -84,9 +84,9 @@ class SponsorBlockResourcePatch : ResourcePatch {
|
||||
if (!(view.hasAttributes() && view.attributes.getNamedItem("android:id").nodeValue.endsWith("player_video_heading"))) continue
|
||||
|
||||
// voting button id from the voting button view from the youtube_controls_layout.xml host file
|
||||
val SBButtonId = "@+id/sponsorblock_button"
|
||||
val votingButtonId = "@+id/sb_voting_button"
|
||||
|
||||
view.attributes.getNamedItem("android:layout_toStartOf").nodeValue = SBButtonId
|
||||
view.attributes.getNamedItem("android:layout_toStartOf").nodeValue = votingButtonId
|
||||
|
||||
break
|
||||
}
|
||||
|
||||
@ -1,72 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<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</string>
|
||||
<string name="api_mirror_url_changed">API MIRROR URL changed</string>
|
||||
<string name="api_mirror_url_invalid">Provided API MIRROR URL is invalid</string>
|
||||
<string name="api_mirror_url_reset">API MIRROR URL reset</string>
|
||||
<string name="api_url_changed">API URL changed</string>
|
||||
<string name="api_url_invalid">Provided API URL is invalid</string>
|
||||
<string name="api_url_reset">API URL reset</string>
|
||||
<string name="color_change">Are you looking for changing colors?</string>
|
||||
<string name="color_changed">Color changed</string>
|
||||
<string name="color_change_sum">"You can now change a category's color by clicking on it above."</string>
|
||||
<string name="color_invalid">Invalid hex code</string>
|
||||
<string name="color_reset">Color reset</string>
|
||||
<string name="diff_segments">What to do with different segments</string>
|
||||
<string name="enable_sb">Enable SponsorBlock</string>
|
||||
<string name="enable_sb_mirror">Enable SponsorBlock Mirror</string>
|
||||
<string name="enable_sb_mirror_sum">When SponsorBlock API server is taken down, switch mirror API server to default API server</string>
|
||||
<string name="enable_sb_sum">SponsorBlock is a crowd-sourced system for skipping annoying parts in YouTube videos</string>
|
||||
<string name="enable_segmadding">Enable new segment adding</string>
|
||||
<string name="enable_segmadding_sum">Switch this on to enable experimental segment adding (has button visibility issues)</string>
|
||||
<string name="enable_voting">Enable voting</string>
|
||||
<string name="enable_voting_sum">Switch this on to enable voting.</string>
|
||||
<string name="general">General</string>
|
||||
<string name="general_adjusting">Adjusting new segment step</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="general_api_mirror_url">Change API Mirror URL</string>
|
||||
<string name="general_api_mirror_url_sum">"Mirror server address to switch to when SponsorBlock server is taken down. <b>Don't change this unless you know what you're doing.</b>"</string>
|
||||
<string name="general_api_url">Change API URL</string>
|
||||
<string name="general_api_url_sum">"The address SponsorBlock uses to make calls to the server. <b>Don't change this unless you know what you're doing.</b>"</string>
|
||||
<string name="general_min_duration">Minimum segment duration</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="general_skipcount">Skip count tracking</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="general_skiptoast">Show a toast when skipping segment automatically</string>
|
||||
<string name="general_skiptoast_sum">Click to see an example toast</string>
|
||||
<string name="general_time_without_sb">Show time without segments</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="general_uuid">Your private user id</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="hours">hrs</string>
|
||||
<string name="microg_not_installed_notice">Please install MicroG</string>
|
||||
<string name="microg_not_installed_warning">MicroG is not found</string>
|
||||
<string name="microg_not_running_warning">MicroG does not run in the background</string>
|
||||
<string name="microg_settings_summary">Enable cloud messaging settings to receive notifications</string>
|
||||
<string name="microg_settings_title">Open MicroG</string>
|
||||
<string name="minutes">min</string>
|
||||
<string name="new_segment_choose_category">Choose the segment category</string>
|
||||
<string name="new_segment_confirm_content" formatted="false">"The segment lasts from %02d:%02d to %02d:%02d (%d minutes %02d seconds)
|
||||
Is it ready to submit?"</string>
|
||||
<string name="new_segment_confirm_title">Are the times correct?</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="new_segment_edit_by_hand_content">Do you want to edit the timing for the start or end of the segment?</string>
|
||||
<string name="new_segment_edit_by_hand_parse_error">Invalid time given</string>
|
||||
<string name="new_segment_edit_by_hand_saved">Done</string>
|
||||
<string name="new_segment_edit_by_hand_title">Edit timing of segment manually</string>
|
||||
<string name="new_segment_mark_end">end</string>
|
||||
<string name="new_segment_mark_locations_first">Mark two locations on the time bar first</string>
|
||||
<string name="new_segment_mark_start">start</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="new_segment_now">now</string>
|
||||
<string name="new_segment_time_end">Time the segment ends at</string>
|
||||
<string name="new_segment_time_end_set">End of segment set</string>
|
||||
<string name="new_segment_time_start">Time the segment begins at</string>
|
||||
<string name="new_segment_time_start_set">Beginning of segment set</string>
|
||||
<string name="new_segment_title">New SponsorBlock segment</string>
|
||||
<string name="reset">Reset</string>
|
||||
<string name="revanced_adremover_button_ads_summary_off">Buttoned ads are shown</string>
|
||||
<string name="revanced_adremover_button_ads_summary_on">Buttoned ads are hidden</string>
|
||||
<string name="revanced_adremover_button_ads_title">Hide buttoned ad</string>
|
||||
@ -103,7 +41,7 @@ Is it ready to submit?"</string>
|
||||
<string name="revanced_default_video_speed_title">Default video speed</string>
|
||||
<string name="revanced_disable_default_video_speed_live_summary_off">Default video speed is enabled in live stream</string>
|
||||
<string name="revanced_disable_default_video_speed_live_summary_on">Default video speed is disabled in live stream</string>
|
||||
<string name="revanced_disable_default_video_speed_live_title">Disable default video speed in live stream</string>
|
||||
<string name="revanced_disable_default_video_speed_live_title">Default Video speed in live stream</string>
|
||||
<string name="revanced_disable_haptic_feedback_chapters_summary_off">Chapters haptic feedback is enabled</string>
|
||||
<string name="revanced_disable_haptic_feedback_chapters_summary_on">Chapters haptic feedback is disabled</string>
|
||||
<string name="revanced_disable_haptic_feedback_chapters_title">Disable chapters haptic feedback</string>
|
||||
@ -597,87 +535,170 @@ Since these setting is quite outdated, it may not be valid"</string>
|
||||
<string name="revanced_whitelisting_sponsorblock">SponsorBlock</string>
|
||||
<string name="revanced_whitelisting_sponsorblock_button">SB</string>
|
||||
<string name="revanced_whitelisting_title">Channel Whitelist</string>
|
||||
<string name="sb_connection_failed">Sponsorblock server is not responding!</string>
|
||||
<string name="sb_guidelines_popup_already_read">Already read</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_open">Show me</string>
|
||||
<string name="sb_guidelines_popup_title">There are guidelines</string>
|
||||
<string name="sb_guidelines_preference_sum">Guidelines contain tips and rules about submitting segments</string>
|
||||
|
||||
<string name="sb_enable_sb">Enable SponsorBlock</string>
|
||||
<string name="sb_enable_sb_sum">SponsorBlock is a crowd-sourced system for skipping annoying parts of YouTube videos</string>
|
||||
<string name="sb_enable_voting">Show voting button</string>
|
||||
<string name="sb_enable_voting_sum_on">Segment voting button is shown</string>
|
||||
<string name="sb_enable_voting_sum_off">Segment voting button is not shown</string>
|
||||
<string name="sb_enable_create_segment">Show create new segment button</string>
|
||||
<string name="sb_enable_create_segment_sum_on">Create new segment button is shown</string>
|
||||
<string name="sb_enable_create_segment_sum_off">Create new segment button is not shown</string>
|
||||
<string name="sb_enable_compact_skip_button">Use compact skip button</string>
|
||||
<string name="sb_enable_compact_skip_button_sum_on">Skip button styled for minimum width</string>
|
||||
<string name="sb_enable_compact_skip_button_sum_off">Skip button styled for best appearance</string>
|
||||
<string name="sb_diff_segments">What to do with different segments</string>
|
||||
<string name="sb_general">General</string>
|
||||
<string name="sb_general_skiptoast">Show a toast when skipping segment automatically</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="sb_general_skiptoast_sum_off">Toast not shown. Tap here to see an example</string>
|
||||
<string name="sb_general_skipcount">Enable skip count tracking</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="sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>
|
||||
<string name="sb_general_time_without">Show video length without segments</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="sb_general_time_without_sum_off">Full video length shown</string>
|
||||
<string name="sb_general_adjusting">Adjust new segment step</string>
|
||||
<string name="sb_general_adjusting_sum">Number of milliseconds the time adjustment buttons move when creating new segments</string>
|
||||
<string name="sb_general_adjusting_invalid">Value must be a positive number</string>
|
||||
<string name="sb_general_min_duration">Minimum segment duration</string>
|
||||
<string name="sb_general_min_duration_sum">Segments shorter than this value (in seconds) will not be shown or skipped</string>
|
||||
<string name="sb_general_uuid">Your private user id</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="sb_general_uuid_invalid">User id cannot be blank</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="sb_general_api_url">Change API URL</string>
|
||||
<string name="sb_general_api_url_sum">The address SponsorBlock uses to make calls to the server. <b>Don\'t change this unless you know what you\'re doing</b></string>
|
||||
|
||||
<string name="sb_segments_sponsor">Sponsor</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="sb_segments_selfpromo">Unpaid/Self Promotion</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="sb_segments_interaction">Interaction Reminder (Subscribe)</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="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="sb_skip_button_compact">Skip</string>
|
||||
<string name="sb_skip_button_sponsor">Skip sponsor</string>
|
||||
<string name="sb_skip_button_selfpromo">Skip promo</string>
|
||||
<string name="sb_skip_button_interaction">Skip interact</string>
|
||||
<string name="sb_skip_button_intro_beginning">Skip intro</string>
|
||||
<string name="sb_skip_button_intro_middle">Skip intermission</string>
|
||||
<string name="sb_skip_button_intro_end">Skip intermission</string>
|
||||
<string name="sb_skip_button_outro">Skip outro</string>
|
||||
<string name="sb_skip_button_preview_beginning">Skip preview</string>
|
||||
<string name="sb_skip_button_preview_middle">Skip preview</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="sb_skipped_sponsor">Skipped sponsor</string>
|
||||
<string name="sb_skipped_selfpromo">Skipped self promotion</string>
|
||||
<string name="sb_skipped_interaction">Skipped annoying reminder</string>
|
||||
<string name="sb_skipped_intro_beginning">Skipped intro</string>
|
||||
<string name="sb_skipped_intro_middle">Skipped intermission</string>
|
||||
<string name="sb_skipped_intro_end">Skipped intermission</string>
|
||||
<string name="sb_skipped_outro">Skipped outro</string>
|
||||
<string name="sb_skipped_preview_beginning">Skipped preview</string>
|
||||
<string name="sb_skipped_preview_middle">Skipped preview</string>
|
||||
<string name="sb_skipped_preview_end">Skipped recap</string>
|
||||
<string name="sb_skipped_filler">Skipped filler</string>
|
||||
<string name="sb_skipped_nomusic">Skipped a non-music section</string>
|
||||
<string name="sb_skipped_unsubmitted">Skipped unsubmitted segment</string>
|
||||
<string name="sb_skipped_multiple_segments">Skipped multiple segments</string>
|
||||
|
||||
<string name="sb_skip_automatically">Skip automatically</string>
|
||||
<string name="sb_skip_automatically_once">Skip automatically once</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_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">Integration made by JakubWeg</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_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_switching_success">Switched successfully. reload the video</string>
|
||||
<string name="sb_switching_to_mirror">Switching mirror API server to main API server..</string>
|
||||
<string name="sb_guidelines_preference_sum">Guidelines contain rules and tips for creating new segments</string>
|
||||
<string name="sb_guidelines_popup_title">Follow the guidelines</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_open">Show me</string>
|
||||
|
||||
<string name="sb_stats">Stats</string>
|
||||
<string name="sb_stats_connection_failure">Stats temporarily not available (API is down)</string>
|
||||
<string name="sb_stats_sb_disabled">SponsorBlock is disabled</string>
|
||||
<string name="sb_stats_username" formatted="false">Your username: <b>%s</b></string>
|
||||
<string name="sb_stats_username_change">Tap here to change your username</string>
|
||||
<string name="sb_stats_username_change_unknown_error" formatted="false">Unable to change username: Status: %d %s</string>
|
||||
<string name="sb_stats_username_changed">Username successfully changed</string>
|
||||
<string name="sb_stats_reputation" formatted="false">You\'re reputation is <b>%.2f</b></string>
|
||||
<string name="sb_stats_submissions" formatted="false">You\'ve created <b>%s</b> segments</string>
|
||||
<string name="sb_stats_saved_zero">SponsorBlock leaderboard</string>
|
||||
<string name="sb_stats_saved" formatted="false">You\'ve saved people from <b>%s</b> segments</string>
|
||||
<string name="sb_stats_saved_sum_zero">Tap here to see the global stats and top contributors</string>
|
||||
<string name="sb_stats_saved_sum" formatted="false">That\'s <b>%s</b> of their lives.<br>Tap here to see the leaderboard</string>
|
||||
<string name="sb_stats_self_saved" formatted="false">You\'ve skipped <b>%s</b> segments</string>
|
||||
<string name="sb_stats_self_saved_sum" formatted="false">That\'s <b>%s</b></string>
|
||||
<string name="sb_stats_self_saved_reset_title">Reset skipped segments counter?</string>
|
||||
<string name="sb_stats_saved_hour_format" formatted="false">%d hours %d minutes</string>
|
||||
<string name="sb_stats_saved_minute_format" formatted="false">%d minutes %d seconds</string>
|
||||
<string name="sb_stats_saved_second_format" formatted="false">%d seconds</string>
|
||||
<string name="sb_color_dot_label">Color:</string>
|
||||
<string name="sb_color_changed">Color changed</string>
|
||||
<string name="sb_color_reset">Color reset</string>
|
||||
<string name="sb_color_invalid">Invalid color code</string>
|
||||
<string name="sb_reset_color">Reset color</string>
|
||||
|
||||
<string name="sb_reset">Reset</string>
|
||||
<string name="sb_api_url_reset">API URL reset</string>
|
||||
<string name="sb_api_url_invalid">API URL is invalid</string>
|
||||
<string name="sb_api_url_changed">API URL changed</string>
|
||||
|
||||
<string name="seconds">sec</string>
|
||||
<string name="segments_endcards">Endcards/Credits</string>
|
||||
<string name="segments_endcards_sum">Credits or when the YouTube endcards appear. Not for spoken conclusions</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="segments_intermission">Intermission/Intro Animation</string>
|
||||
<string name="segments_intermission_sum">An interval without actual content. Could be a pause, static frame, repeating animation</string>
|
||||
<string name="segments_nomusic">Music: Non-Music Section</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_preview">Preview/Recap</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="segments_selfpromo">Unpaid/Self Promotion</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="segments_sponsor">Sponsor</string>
|
||||
<string name="segments_sponsor_sum">Paid promotion, paid referrals and direct advertisements</string>
|
||||
<string name="segments_subscribe">Interaction Reminder (Subscribe)</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="settings_export_failed">Failed to export settings</string>
|
||||
<string name="settings_export_successful">Settings were successfully exported</string>
|
||||
<string name="settings_ie">Import/Export settings</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="settings_import_failed">Failed to import settings</string>
|
||||
<string name="settings_import_successful">Settings were successfully imported</string>
|
||||
<string name="skipped_endcard">Skipped outro</string>
|
||||
<string name="skipped_filler">Skipped filler</string>
|
||||
<string name="skipped_intermission">Skipped intro</string>
|
||||
<string name="skipped_nomusic">Skipped a non-music section</string>
|
||||
<string name="skipped_preview">Skipped preview</string>
|
||||
<string name="skipped_segment">Skipped a sponsor segment</string>
|
||||
<string name="skipped_selfpromo">Skipped self promotion</string>
|
||||
<string name="skipped_sponsor">Skipped sponsor</string>
|
||||
<string name="skipped_subscribe">Skipped annoying reminder</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_ignore">"Don't do anything"</string>
|
||||
<string name="skip_showbutton">Show a skip button</string>
|
||||
<string name="skip_sponsor">Skip segment</string>
|
||||
<string name="stats">Stats</string>
|
||||
<string name="stats_saved">"You've saved people from <b>%s</b> segments."</string>
|
||||
<string name="stats_saved_sum">"That's <b>%s</b> of their lives. Click to see the leaderboard"</string>
|
||||
<string name="stats_sb_disabled">SponsorBlock is disabled</string>
|
||||
<string name="stats_self_saved">"You've skipped <b>%s</b> segments."</string>
|
||||
<string name="stats_self_saved_sum">"That's <b>%s</b>."</string>
|
||||
<string name="stats_submissions">Submissions: <b>%s</b></string>
|
||||
<string name="stats_username">Your username: <b>%s</b></string>
|
||||
<string name="stats_username_change">Click to change your username</string>
|
||||
<string name="stats_username_changed">Username successfully changed</string>
|
||||
<string name="stats_username_change_unknown_error" formatted="false">Unable to change username: Status: %d %s</string>
|
||||
<string name="submit_failed_duplicate">"Can't submit the segment.
|
||||
Already exists"</string>
|
||||
<string name="submit_failed_forbidden">"Can't submit the segment.
|
||||
|
||||
%s"</string>
|
||||
|
||||
<string name="submit_failed_invalid">Can\'t submit the segment: %s</string>
|
||||
<string name="submit_failed_rate_limit">"Can't submit the segment.
|
||||
Rate Limited (Too many from the same user or IP)"</string>
|
||||
<string name="submit_failed_unknown_error" formatted="false">Unable to submit segments: Status: %d %s</string>
|
||||
<string name="submit_started">Submitting segment…</string>
|
||||
<string name="submit_succeeded">Segment submitted successfully</string>
|
||||
<string name="tap_skip">Tap to skip</string>
|
||||
<string name="vote_category">Change category</string>
|
||||
<string name="vote_downvote">Downvote</string>
|
||||
<string name="vote_failed_forbidden">"Can't vote for segment.
|
||||
|
||||
%s"</string>
|
||||
<string name="vote_failed_rate_limit">"Can't vote for segment.
|
||||
Rate Limited (Too many from the same user or IP)"</string>
|
||||
<string name="vote_failed_unknown_error" formatted="false">Unable to vote for segment: Status: %d %s</string>
|
||||
<string name="vote_no_segments">There are no segments to vote for</string>
|
||||
<string name="vote_started">Voting for segment…</string>
|
||||
<string name="vote_succeeded">Voted successfully</string>
|
||||
<string name="vote_upvote">Upvote</string>
|
||||
</resources>
|
||||
|
||||
@ -46,5 +46,6 @@
|
||||
<string name="revanced_themes_materialyou">materialyou</string>
|
||||
<string name="revanced_themes_mix">materialyou + amoled</string>
|
||||
|
||||
<string name="stats_loading">@string/pref_offline_smart_downloads_loading</string>
|
||||
<string name="sb_about_api">Sponsor.Ajay.app</string>
|
||||
<string name="sb_stats_loading">@string/pref_offline_smart_downloads_loading</string>
|
||||
</resources>
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:tint="#ffffffff" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ffffffff" android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15,12c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3z" />
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10 10,-4.49 10,-10S17.51,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM15,12c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3z" />
|
||||
</vector>
|
||||
@ -1,5 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:tint="#ffffffff" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M10,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h5v2h2L12,1h-2v2zM10,18L5,18l5,-6v6zM19,3h-5v2h5v13l-5,-6v9h5c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2z" />
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M10,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h5v2h2L12,1h-2v2zM10,18L5,18l5,-6v6zM19,3h-5v2h5v13l-5,-6v9h5c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2z" />
|
||||
</vector>
|
||||
@ -1,5 +1,10 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:tint="#ffffffff" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:tint="#FFFFFF"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="@android:color/white"
|
||||
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
|
||||
</vector>
|
||||
@ -1,6 +1,13 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<vector android:alpha="0.95" android:height="24.0dip" android:width="24.0dip" android:viewportWidth="24.0" android:viewportHeight="24.0"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="#ffffffff" android:pathData="M12,22.7994C11.55,22.7994 11.1,22.7094 10.74,22.4394 4.89,18.8394 1.29,12.6294 1.2,5.7894 1.2,4.8894 1.65,3.9894 2.46,3.5394 8.4,0.3894 15.6,0.3894 21.54,3.6294 22.35,3.9894 22.8,4.8894 22.8,5.7894 22.71,12.6294 19.11,18.8394 13.35,22.4394 12.9,22.7094 12.45,22.7994 12,22.7994ZM12,1.9194c-3.15,0 -6.3,0.81 -9.18,2.34 -0.54,0.27 -0.9,0.9 -0.9,1.53 0.09,6.57 3.51,12.51 9.18,16.02 0.54,0.36 1.26,0.36 1.8,0C18.57,18.3894 21.9,12.3594 22.08,5.7894 22.08,5.1594 21.72,4.5294 21.18,4.2594 18.3,2.7294 15.15,1.9194 12,1.9194Z" />
|
||||
<path android:fillColor="#ffffffff" android:pathData="M20.73,4.9794C15.24,2.0994 8.76,2.0994 3.27,4.9794 3,5.1594 2.82,5.4294 2.82,5.7894c0.09,6.48 3.51,12.06 8.73,15.3 0.27,0.18 0.63,0.18 0.9,0 5.13,-3.15 8.64,-8.82 8.73,-15.3C21.18,5.4294 21,5.1594 20.73,4.9794ZM9.66,15.1494L9.66,6.7794l7.29,4.23z" />
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:alpha="0.95"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:pathData="M12,22.7994C11.55,22.7994 11.1,22.7094 10.74,22.4394 4.89,18.8394 1.29,12.6294 1.2,5.7894 1.2,4.8894 1.65,3.9894 2.46,3.5394 8.4,0.3894 15.6,0.3894 21.54,3.6294 22.35,3.9894 22.8,4.8894 22.8,5.7894 22.71,12.6294 19.11,18.8394 13.35,22.4394 12.9,22.7094 12.45,22.7994 12,22.7994ZM12,1.9194c-3.15,0 -6.3,0.81 -9.18,2.34 -0.54,0.27 -0.9,0.9 -0.9,1.53 0.09,6.57 3.51,12.51 9.18,16.02 0.54,0.36 1.26,0.36 1.8,0C18.57,18.3894 21.9,12.3594 22.08,5.7894 22.08,5.1594 21.72,4.5294 21.18,4.2594 18.3,2.7294 15.15,1.9194 12,1.9194Z" />
|
||||
<path
|
||||
android:fillColor="#FFFFFF"
|
||||
android:pathData="M20.73,4.9794C15.24,2.0994 8.76,2.0994 3.27,4.9794 3,5.1594 2.82,5.4294 2.82,5.7894c0.09,6.48 3.51,12.06 8.73,15.3 0.27,0.18 0.63,0.18 0.9,0 5.13,-3.15 8.64,-8.82 8.73,-15.3C21.18,5.4294 21,5.1594 20.73,4.9794ZM9.66,15.1494L9.66,6.7794l7.29,4.23z" />
|
||||
</vector>
|
||||
File diff suppressed because one or more lines are too long
@ -1,4 +1,27 @@
|
||||
<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:visibility="gone" 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:scaleType="center" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="4dp" android:layout_toStartOf="@+id/voting_button" 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:visibility="gone" 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:scaleType="center" android:layout_alignParentTop="true" android:layout_alignWithParentIfMissing="true" android:layout_marginEnd="4dp" android:layout_toStartOf="@id/music_app_deeplink_button" style="@style/YouTubePlayerButton" />
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<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/music_app_deeplink_button"
|
||||
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>
|
||||
|
||||
@ -1,5 +1,23 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<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>
|
||||
@ -3,58 +3,58 @@
|
||||
xmlns:yt="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<LinearLayout
|
||||
android:gravity="start|center"
|
||||
android:orientation="vertical"
|
||||
android:id="@+id/new_segment_container"
|
||||
android:background="#66000000"
|
||||
android:id="@+id/sb_new_segment_container"
|
||||
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
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="36.0dip">
|
||||
|
||||
<ImageButton
|
||||
android:layout_gravity="start|center"
|
||||
android:id="@+id/new_segment_rewind"
|
||||
android:background="@android:color/transparent"
|
||||
android:paddingTop="3.0dip"
|
||||
android:paddingBottom="3.0dip"
|
||||
android:id="@+id/sb_new_segment_rewind"
|
||||
android:layout_width="45.0dip"
|
||||
android:layout_height="36.0dip"
|
||||
android:src="@drawable/player_fast_rewind"
|
||||
android:contentDescription="@null"
|
||||
android:layout_gravity="start|center"
|
||||
android:alpha="1.0"
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@null"
|
||||
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
|
||||
android:layout_gravity="start|center"
|
||||
android:id="@+id/new_segment_forward"
|
||||
android:background="@android:color/transparent"
|
||||
android:paddingTop="3.0dip"
|
||||
android:paddingBottom="3.0dip"
|
||||
android:id="@+id/sb_new_segment_forward"
|
||||
android:layout_width="45.0dip"
|
||||
android:layout_height="36.0dip"
|
||||
android:src="@drawable/player_fast_forward"
|
||||
android:contentDescription="@null"
|
||||
android:layout_gravity="start|center"
|
||||
android:alpha="1.0"
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@null"
|
||||
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
|
||||
android:layout_gravity="start|center"
|
||||
android:id="@+id/new_segment_adjust"
|
||||
android:background="@android:color/transparent"
|
||||
android:paddingTop="3.0dip"
|
||||
android:paddingBottom="3.0dip"
|
||||
android:id="@+id/sb_new_segment_adjust"
|
||||
android:layout_width="45.0dip"
|
||||
android:layout_height="36.0dip"
|
||||
android:src="@drawable/ic_sb_adjust"
|
||||
android:contentDescription="@null"
|
||||
android:layout_gravity="start|center"
|
||||
android:alpha="1.0"
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@null"
|
||||
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
|
||||
@ -62,46 +62,46 @@
|
||||
android:layout_height="36.0dip">
|
||||
|
||||
<ImageButton
|
||||
android:layout_gravity="start|center"
|
||||
android:id="@+id/new_segment_compare"
|
||||
android:background="@android:color/transparent"
|
||||
android:paddingTop="3.0dip"
|
||||
android:paddingBottom="3.0dip"
|
||||
android:id="@+id/sb_new_segment_compare"
|
||||
android:layout_width="45.0dip"
|
||||
android:layout_height="36.0dip"
|
||||
android:src="@drawable/ic_sb_compare"
|
||||
android:contentDescription="@null"
|
||||
android:layout_gravity="start|center"
|
||||
android:alpha="1.0"
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@null"
|
||||
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
|
||||
android:layout_gravity="start|center"
|
||||
android:id="@+id/new_segment_edit"
|
||||
android:background="@android:color/transparent"
|
||||
android:paddingTop="3.0dip"
|
||||
android:paddingBottom="3.0dip"
|
||||
android:id="@+id/sb_new_segment_edit"
|
||||
android:layout_width="45.0dip"
|
||||
android:layout_height="36.0dip"
|
||||
android:src="@drawable/ic_sb_edit"
|
||||
android:contentDescription="@null"
|
||||
android:layout_gravity="start|center"
|
||||
android:alpha="1.0"
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@null"
|
||||
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
|
||||
android:layout_gravity="start|center"
|
||||
android:id="@+id/new_segment_publish"
|
||||
android:background="@android:color/transparent"
|
||||
android:paddingTop="3.0dip"
|
||||
android:paddingBottom="3.0dip"
|
||||
android:id="@+id/sb_new_segment_publish"
|
||||
android:layout_width="45.0dip"
|
||||
android:layout_height="36.0dip"
|
||||
android:src="@drawable/ic_sb_publish"
|
||||
android:contentDescription="@null"
|
||||
android:layout_gravity="start|center"
|
||||
android:alpha="1.0"
|
||||
android:background="@android:color/transparent"
|
||||
android:contentDescription="@null"
|
||||
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>
|
||||
</merge>
|
||||
@ -1,7 +1,36 @@
|
||||
<?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: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">
|
||||
<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"/>
|
||||
<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: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>
|
||||
</merge>
|
||||
Loading…
x
Reference in New Issue
Block a user