baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

fixed some merge issues

Browse source
This commit is contained in:
polymorphicshade 2022-07-09 11:32:00 -06:00
parent a4b9c8f19b
commit 0127c35462
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/schabi/newpipe/settings/SponsorBlockCategoriesSettingsFragment.java
View file

@ -37,31 +37,24 @@ public class SponsorBlockCategoriesSettingsFragment extends BasePreferenceFragme
setColorPreference(editor, setColorPreference(editor,
R.string.sponsor_block_category_sponsor_color_key, R.string.sponsor_block_category_sponsor_color_key,
R.color.sponsor_segment); R.color.sponsor_segment);
setColorPreference(editor, setColorPreference(editor,
R.string.sponsor_block_category_intro_color_key, R.string.sponsor_block_category_intro_color_key,
R.color.intro_segment); R.color.intro_segment);
setColorPreference(editor, setColorPreference(editor,
R.string.sponsor_block_category_outro_color_key, R.string.sponsor_block_category_outro_color_key,
R.color.outro_segment); R.color.outro_segment);
setColorPreference(editor, setColorPreference(editor,
R.string.sponsor_block_category_interaction_color_key, R.string.sponsor_block_category_interaction_color_key,
R.color.interaction_segment); R.color.interaction_segment);
setColorPreference(editor, setColorPreference(editor,
R.string.sponsor_block_category_self_promo_color_key, R.string.sponsor_block_category_self_promo_color_key,
R.color.self_promo_segment); R.color.self_promo_segment);
setColorPreference(editor, setColorPreference(editor,
R.string.sponsor_block_category_non_music_color_key, R.string.sponsor_block_category_non_music_color_key,
R.color.non_music_segment); R.color.non_music_segment);
setColorPreference(editor, setColorPreference(editor,
R.string.sponsor_block_category_preview_color_key, R.string.sponsor_block_category_preview_color_key,
R.color.preview_segment); R.color.preview_segment);
setColorPreference(editor, setColorPreference(editor,
R.string.sponsor_block_category_filler_color_key, R.string.sponsor_block_category_filler_color_key,
R.color.filler_segment); R.color.filler_segment);

5
app/src/main/java/org/schabi/newpipe/util/SponsorBlockUtils.java
View file

@ -98,7 +98,8 @@ public final class SponsorBlockUtils {
} }
if (includePreviewCategory) { if (includePreviewCategory) {
categoryParamList.add("preview"); categoryParamList.add("preview");
}
if (includeFillerCategory) { if (includeFillerCategory) {
categoryParamList.add("filler"); categoryParamList.add("filler");
} }
@ -286,6 +287,8 @@ public final class SponsorBlockUtils {
return colorStr == null return colorStr == null
? context.getResources().getColor(R.color.preview_segment) ? context.getResources().getColor(R.color.preview_segment)
: Color.parseColor(colorStr); : Color.parseColor(colorStr);
}
break;
case "filler": case "filler":
key = context.getString(R.string.sponsor_block_category_filler_key); key = context.getString(R.string.sponsor_block_category_filler_key);
if (prefs.getBoolean(key, false)) { if (prefs.getBoolean(key, false)) {