Skip to content

Commit

Permalink
fix(YouTube - SponsorBlock): Remove obsolete UI code that fails to wo…
Browse files Browse the repository at this point in the history
…rk with some custom roms
  • Loading branch information
LisoUseInAIKyrios committed Nov 20, 2024
1 parent 3691fe6 commit 25aceca
Showing 1 changed file with 6 additions and 24 deletions.
Original file line number Diff line number Diff line change
@@ -1,29 +1,20 @@
package app.revanced.extension.youtube.sponsorblock.ui;

import static app.revanced.extension.shared.Utils.getResourceDimensionPixelSize;
import static app.revanced.extension.shared.Utils.getResourceIdentifier;

import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.drawable.RippleDrawable;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.widget.FrameLayout;
import android.widget.ImageButton;

import app.revanced.extension.shared.Logger;
import app.revanced.extension.youtube.patches.VideoInformation;
import app.revanced.extension.youtube.settings.Settings;
import app.revanced.extension.youtube.sponsorblock.SponsorBlockUtils;
import app.revanced.extension.shared.Logger;

import static app.revanced.extension.shared.Utils.getResourceDimensionPixelSize;
import static app.revanced.extension.shared.Utils.getResourceIdentifier;

public final class NewSegmentLayout extends FrameLayout {
private static final ColorStateList rippleColorStateList = new ColorStateList(
new int[][]{new int[]{android.R.attr.state_enabled}},
new int[]{0x33ffffff} // sets the ripple color to white
);
private final int rippleEffectId;

final int defaultBottomMargin;
final int ctaBottomMargin;

Expand All @@ -47,10 +38,6 @@ public NewSegmentLayout(final Context context, final AttributeSet attributeSet,
getResourceIdentifier(context, "revanced_sb_new_segment", "layout"), this, true
);

TypedValue rippleEffect = new TypedValue();
context.getTheme().resolveAttribute(android.R.attr.selectableItemBackground, rippleEffect, true);
rippleEffectId = rippleEffect.resourceId;

initializeButton(
context,
"revanced_sb_new_segment_rewind",
Expand Down Expand Up @@ -107,12 +94,7 @@ public NewSegmentLayout(final Context context, final AttributeSet attributeSet,
*/
private void initializeButton(final Context context, final String resourceIdentifierName,
final ButtonOnClickHandlerFunction handler, final String debugMessage) {
final ImageButton button = findViewById(getResourceIdentifier(context, resourceIdentifierName, "id"));

// Add ripple effect
button.setBackgroundResource(rippleEffectId);
RippleDrawable rippleDrawable = (RippleDrawable) button.getBackground();
rippleDrawable.setColor(rippleColorStateList);
ImageButton button = findViewById(getResourceIdentifier(context, resourceIdentifierName, "id"));

button.setOnClickListener((v) -> {
handler.apply();
Expand All @@ -121,7 +103,7 @@ private void initializeButton(final Context context, final String resourceIdenti
}

@FunctionalInterface
public interface ButtonOnClickHandlerFunction {
private interface ButtonOnClickHandlerFunction {
void apply();
}
}

0 comments on commit 25aceca

Please # to comment.