From 3e5e99929b3f914a975cdefab45da53139979a85 Mon Sep 17 00:00:00 2001 From: caneleex Date: Fri, 16 Apr 2021 19:43:03 +0200 Subject: [PATCH 1/4] add basic support --- .../SponsorBlockPreferenceFragment.java | 12 ++++++++++-- .../java/pl/jakubweg/SponsorBlockSettings.java | 17 ++++++++++++----- 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java b/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java index 595e001..20990e4 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java @@ -18,7 +18,6 @@ import android.preference.SwitchPreference; import android.text.InputType; import android.widget.Toast; -import java.io.File; import java.util.ArrayList; import static pl.jakubweg.SponsorBlockSettings.DefaultBehaviour; @@ -31,10 +30,10 @@ import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_UUID; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_NAME; import static pl.jakubweg.SponsorBlockSettings.adjustNewSegmentMillis; import static pl.jakubweg.SponsorBlockSettings.countSkips; -import static pl.jakubweg.SponsorBlockSettings.getPreferences; import static pl.jakubweg.SponsorBlockSettings.setSeenGuidelines; import static pl.jakubweg.SponsorBlockSettings.showToastWhenSkippedAutomatically; import static pl.jakubweg.SponsorBlockSettings.uuid; +import static pl.jakubweg.StringRef.sf; import static pl.jakubweg.StringRef.str; @@ -155,7 +154,16 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment implement preference.setDefaultValue(defaultValue); preference.setEntries(entries); preference.setEntryValues(entryValues); + + EditTextPreference colorPreference = new EditTextPreference(context); + colorPreference.setTitle("Set " + segmentInfo.title + " color"); + colorPreference.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER); + colorPreference.setKey(segmentInfo.key + "_color"); + colorPreference.setDefaultValue(segmentInfo.color); + preferencesToDisableWhenSBDisabled.add(colorPreference); + category.addPreference(preference); + category.addPreference(colorPreference); } } diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java b/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java index 27b1939..47509f0 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java @@ -7,7 +7,6 @@ import android.text.Html; import android.text.TextUtils; import android.util.Log; -import java.io.File; import java.util.ArrayList; import java.util.HashMap; import java.util.Map; @@ -108,6 +107,9 @@ public class SponsorBlockSettings { segment.behaviour = behaviour; if (behaviour.showOnTimeBar) enabledCategories.add(segment.key); + + String tmp = preferences.getString(segment.key + "_color", String.valueOf(segment.color)); + segment.setColor(Integer.parseInt(tmp)); } //"[%22sponsor%22,%22outro%22,%22music_offtopic%22,%22intro%22,%22selfpromo%22,%22interaction%22]"; @@ -183,8 +185,8 @@ public class SponsorBlockSettings { public final StringRef title; public final StringRef skipMessage; public final StringRef description; - public final int color; public final Paint paint; + public int color; public SegmentBehaviour behaviour; private CharSequence lazyTitleWithDot; @@ -201,8 +203,7 @@ public class SponsorBlockSettings { this.description = description; this.behaviour = behaviour; this.color = color & 0xFFFFFF; - paint = new Paint(); - paint.setColor(color); + this.paint = new Paint(); } public static SegmentInfo[] valuesWithoutPreview() { @@ -213,9 +214,15 @@ public class SponsorBlockSettings { return mValuesMap.get(key); } + public void setColor(int color) { + this.color = color; + paint.setColor(color); + paint.setAlpha(255); + } + public CharSequence getTitleWithDot() { return (lazyTitleWithDot == null) ? - lazyTitleWithDot = Html.fromHtml(String.format("⬤ %s", color, title)) + lazyTitleWithDot = Html.fromHtml(String.format("⬤ %s", this.color, title)) : lazyTitleWithDot; } } From 63061c0972cfea4ab1ca7fb461cd8f08693df17c Mon Sep 17 00:00:00 2001 From: caneleex Date: Fri, 16 Apr 2021 19:51:11 +0200 Subject: [PATCH 2/4] remove pointless changes --- .../main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java | 1 - app/src/main/java/pl/jakubweg/SponsorBlockSettings.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java b/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java index 20990e4..47b62e3 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java @@ -33,7 +33,6 @@ import static pl.jakubweg.SponsorBlockSettings.countSkips; import static pl.jakubweg.SponsorBlockSettings.setSeenGuidelines; import static pl.jakubweg.SponsorBlockSettings.showToastWhenSkippedAutomatically; import static pl.jakubweg.SponsorBlockSettings.uuid; -import static pl.jakubweg.StringRef.sf; import static pl.jakubweg.StringRef.str; diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java b/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java index 47509f0..72a5a30 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java @@ -222,7 +222,7 @@ public class SponsorBlockSettings { public CharSequence getTitleWithDot() { return (lazyTitleWithDot == null) ? - lazyTitleWithDot = Html.fromHtml(String.format("⬤ %s", this.color, title)) + lazyTitleWithDot = Html.fromHtml(String.format("⬤ %s", color, title)) : lazyTitleWithDot; } } From 5bd9e3472f3f1966b691529385a7fbf5cd939fd9 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 27 Jul 2021 17:26:59 +0200 Subject: [PATCH 3/4] finished the implementation --- .../SponsorBlockPreferenceFragment.java | 44 ++++++++++++++++--- .../pl/jakubweg/SponsorBlockSettings.java | 20 +++++---- .../java/pl/jakubweg/SponsorBlockUtils.java | 4 ++ app/src/main/res/values/strings.xml | 7 +++ 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java b/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java index fe59048..5c2503d 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java @@ -5,6 +5,7 @@ import android.app.AlertDialog; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; +import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.preference.EditTextPreference; @@ -15,6 +16,7 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.preference.SwitchPreference; import android.text.InputType; +import android.widget.EditText; import android.widget.Toast; import java.text.DecimalFormat; @@ -24,6 +26,7 @@ import pl.jakubweg.requests.Requester; import static pl.jakubweg.SponsorBlockSettings.DefaultBehaviour; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_ADJUST_NEW_SEGMENT_STEP; +import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_CATEGORY_COLOR_SUFFIX; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_COUNT_SKIPS; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_NEW_SEGMENT_ENABLED; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_SHOW_TIME_WITHOUT_SEGMENTS; @@ -38,6 +41,7 @@ import static pl.jakubweg.SponsorBlockSettings.setSeenGuidelines; import static pl.jakubweg.SponsorBlockSettings.showTimeWithoutSegments; import static pl.jakubweg.SponsorBlockSettings.showToastWhenSkippedAutomatically; import static pl.jakubweg.SponsorBlockSettings.uuid; +import static pl.jakubweg.SponsorBlockUtils.formatColorString; import static pl.jakubweg.StringRef.str; @SuppressWarnings({"unused", "deprecation"}) // injected @@ -162,17 +166,45 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment implement preference.setEntries(entries); preference.setEntryValues(entryValues); - EditTextPreference colorPreference = new EditTextPreference(context); - colorPreference.setTitle("Set " + segmentInfo.title + " color"); - colorPreference.getEditText().setInputType(InputType.TYPE_CLASS_NUMBER); - colorPreference.setKey(segmentInfo.key + "_color"); - colorPreference.setDefaultValue(segmentInfo.color); + String key = segmentInfo.key + PREFERENCES_KEY_CATEGORY_COLOR_SUFFIX; + Preference colorPreference = new Preference(context); + colorPreference.setTitle(str("color_change")); + + colorPreference.setOnPreferenceClickListener(preference1 -> { + EditText editText = new EditText(context); + editText.setInputType(InputType.TYPE_CLASS_TEXT); + editText.setText(formatColorString(segmentInfo.color)); + + Context applicationContext = context.getApplicationContext(); + SharedPreferences preferences = SponsorBlockSettings.getPreferences(context); + + new AlertDialog.Builder(context) + .setView(editText) + .setPositiveButton(str("change"), (dialog, which) -> { + try { + int color = Color.parseColor(editText.getText().toString()); + segmentInfo.setColor(color); + Toast.makeText(applicationContext, str("color_changed"), Toast.LENGTH_SHORT).show(); + preferences.edit().putString(key, formatColorString(color)).apply(); + } + catch (Exception ex) { + Toast.makeText(applicationContext, str("color_invalid"), Toast.LENGTH_SHORT).show(); + } + }) + .setNeutralButton(str("reset"), (dialog, which) -> { + int defaultColor = segmentInfo.defaultColor; + segmentInfo.setColor(defaultColor); + Toast.makeText(applicationContext, str("color_reset"), Toast.LENGTH_SHORT).show(); + preferences.edit().putString(key, formatColorString(defaultColor)).apply(); + }) + .show(); + return true; + }); preferencesToDisableWhenSBDisabled.add(colorPreference); category.addPreference(preference); category.addPreference(colorPreference); } - } private void addStatsCategory(Context context, PreferenceScreen screen) { diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java b/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java index f644f95..87dc819 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockSettings.java @@ -2,6 +2,7 @@ package pl.jakubweg; import android.content.Context; import android.content.SharedPreferences; +import android.graphics.Color; import android.graphics.Paint; import android.text.Html; import android.text.TextUtils; @@ -28,6 +29,7 @@ public class SponsorBlockSettings { public static final String PREFERENCES_KEY_SKIPPED_SEGMENTS = "sb-skipped-segments"; public static final String PREFERENCES_KEY_SKIPPED_SEGMENTS_TIME = "sb-skipped-segments-time"; public static final String PREFERENCES_KEY_SHOW_TIME_WITHOUT_SEGMENTS = "sb-length-without-segments"; + public static final String PREFERENCES_KEY_CATEGORY_COLOR_SUFFIX = "_color"; public static final SegmentBehaviour DefaultBehaviour = SegmentBehaviour.SKIP_AUTOMATICALLY; @@ -93,6 +95,9 @@ public class SponsorBlockSettings { SegmentBehaviour[] possibleBehaviours = SegmentBehaviour.values(); final ArrayList enabledCategories = new ArrayList<>(possibleBehaviours.length); for (SegmentInfo segment : SegmentInfo.valuesWithoutUnsubmitted()) { + String categoryColor = preferences.getString(segment.key + PREFERENCES_KEY_CATEGORY_COLOR_SUFFIX, SponsorBlockUtils.formatColorString(segment.defaultColor)); + segment.setColor(Color.parseColor(categoryColor)); + SegmentBehaviour behaviour = null; String value = preferences.getString(segment.key, null); if (value == null) @@ -111,9 +116,6 @@ public class SponsorBlockSettings { segment.behaviour = behaviour; if (behaviour.showOnTimeBar) enabledCategories.add(segment.key); - - String tmp = preferences.getString(segment.key + "_color", String.valueOf(segment.color)); - segment.setColor(Integer.parseInt(tmp)); } //"[%22sponsor%22,%22outro%22,%22music_offtopic%22,%22intro%22,%22selfpromo%22,%22interaction%22,%22preview%22]"; @@ -195,23 +197,24 @@ public class SponsorBlockSettings { public final StringRef skipMessage; public final StringRef description; public final Paint paint; + public final int defaultColor; public int color; public SegmentBehaviour behaviour; - private CharSequence lazyTitleWithDot; SegmentInfo(String key, StringRef title, StringRef skipMessage, StringRef description, SegmentBehaviour behaviour, - int color) { + int defaultColor) { this.key = key; this.title = title; this.skipMessage = skipMessage; this.description = description; this.behaviour = behaviour; - this.color = color & 0xFFFFFF; + this.defaultColor = defaultColor; + this.color = defaultColor; this.paint = new Paint(); } @@ -224,15 +227,14 @@ public class SponsorBlockSettings { } public void setColor(int color) { + color = color & 0xFFFFFF; this.color = color; paint.setColor(color); paint.setAlpha(255); } public CharSequence getTitleWithDot() { - return (lazyTitleWithDot == null) ? - lazyTitleWithDot = Html.fromHtml(String.format("⬤ %s", color, title)) - : lazyTitleWithDot; + return Html.fromHtml(String.format("⬤ %s", color, title)); } } } diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java b/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java index 190faf4..af3dc1b 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java @@ -444,6 +444,10 @@ public abstract class SponsorBlockUtils { return count; } + public static String formatColorString(int color) { + return String.format("#%06X", color); + } + @SuppressWarnings("deprecation") public static void addUserStats(PreferenceCategory category, Preference loadingPreference, UserStats stats) { category.removePreference(loadingPreference); diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2e68d5e..7b5ec0b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -183,6 +183,13 @@ Show a skip button Don\'t do anything + Change color + Color changed + Color reset + Invalid hex code + Reset + Change + Stats Loading.. SponsorBlock is disabled From ec3195f6c32b2e999c6da16177f99d935aba8644 Mon Sep 17 00:00:00 2001 From: caneleex Date: Tue, 27 Jul 2021 19:58:14 +0200 Subject: [PATCH 4/4] final touches --- .../SponsorBlockPreferenceFragment.java | 63 +++++++------------ .../java/pl/jakubweg/SponsorBlockUtils.java | 38 +++++++++++ app/src/main/res/values/strings.xml | 5 +- 3 files changed, 62 insertions(+), 44 deletions(-) diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java b/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java index 5c2503d..2f52941 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockPreferenceFragment.java @@ -5,7 +5,6 @@ import android.app.AlertDialog; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; -import android.graphics.Color; import android.net.Uri; import android.os.Bundle; import android.preference.EditTextPreference; @@ -16,7 +15,6 @@ import android.preference.PreferenceFragment; import android.preference.PreferenceScreen; import android.preference.SwitchPreference; import android.text.InputType; -import android.widget.EditText; import android.widget.Toast; import java.text.DecimalFormat; @@ -26,7 +24,6 @@ import pl.jakubweg.requests.Requester; import static pl.jakubweg.SponsorBlockSettings.DefaultBehaviour; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_ADJUST_NEW_SEGMENT_STEP; -import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_CATEGORY_COLOR_SUFFIX; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_COUNT_SKIPS; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_NEW_SEGMENT_ENABLED; import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_SHOW_TIME_WITHOUT_SEGMENTS; @@ -41,7 +38,6 @@ import static pl.jakubweg.SponsorBlockSettings.setSeenGuidelines; import static pl.jakubweg.SponsorBlockSettings.showTimeWithoutSegments; import static pl.jakubweg.SponsorBlockSettings.showToastWhenSkippedAutomatically; import static pl.jakubweg.SponsorBlockSettings.uuid; -import static pl.jakubweg.SponsorBlockUtils.formatColorString; import static pl.jakubweg.StringRef.str; @SuppressWarnings({"unused", "deprecation"}) // injected @@ -157,7 +153,9 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment implement entryValues[i] = behaviour.key; } - for (SponsorBlockSettings.SegmentInfo segmentInfo : SponsorBlockSettings.SegmentInfo.valuesWithoutUnsubmitted()) { + SponsorBlockSettings.SegmentInfo[] categories = SponsorBlockSettings.SegmentInfo.valuesWithoutUnsubmitted(); + + for (SponsorBlockSettings.SegmentInfo segmentInfo : categories) { ListPreference preference = new ListPreference(context); preference.setTitle(segmentInfo.getTitleWithDot()); preference.setSummary(segmentInfo.description.toString()); @@ -166,45 +164,26 @@ public class SponsorBlockPreferenceFragment extends PreferenceFragment implement preference.setEntries(entries); preference.setEntryValues(entryValues); - String key = segmentInfo.key + PREFERENCES_KEY_CATEGORY_COLOR_SUFFIX; - Preference colorPreference = new Preference(context); - colorPreference.setTitle(str("color_change")); - - colorPreference.setOnPreferenceClickListener(preference1 -> { - EditText editText = new EditText(context); - editText.setInputType(InputType.TYPE_CLASS_TEXT); - editText.setText(formatColorString(segmentInfo.color)); - - Context applicationContext = context.getApplicationContext(); - SharedPreferences preferences = SponsorBlockSettings.getPreferences(context); - - new AlertDialog.Builder(context) - .setView(editText) - .setPositiveButton(str("change"), (dialog, which) -> { - try { - int color = Color.parseColor(editText.getText().toString()); - segmentInfo.setColor(color); - Toast.makeText(applicationContext, str("color_changed"), Toast.LENGTH_SHORT).show(); - preferences.edit().putString(key, formatColorString(color)).apply(); - } - catch (Exception ex) { - Toast.makeText(applicationContext, str("color_invalid"), Toast.LENGTH_SHORT).show(); - } - }) - .setNeutralButton(str("reset"), (dialog, which) -> { - int defaultColor = segmentInfo.defaultColor; - segmentInfo.setColor(defaultColor); - Toast.makeText(applicationContext, str("color_reset"), Toast.LENGTH_SHORT).show(); - preferences.edit().putString(key, formatColorString(defaultColor)).apply(); - }) - .show(); - return true; - }); - preferencesToDisableWhenSBDisabled.add(colorPreference); - category.addPreference(preference); - category.addPreference(colorPreference); } + + Preference colorPreference = new Preference(context); + screen.addPreference(colorPreference); + colorPreference.setTitle(str("color_change")); + + colorPreference.setOnPreferenceClickListener(preference1 -> { + CharSequence[] items = new CharSequence[categories.length]; + for (int i = 0; i < items.length; i++) { + items[i] = categories[i].getTitleWithDot(); + } + + new AlertDialog.Builder(context) + .setTitle(str("color_choose_category")) + .setItems(items, SponsorBlockUtils.categoryColorChangeClickListener) + .show(); + return true; + }); + preferencesToDisableWhenSBDisabled.add(colorPreference); } private void addStatsCategory(Context context, PreferenceScreen screen) { diff --git a/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java b/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java index af3dc1b..78dd17a 100644 --- a/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java +++ b/app/src/main/java/pl/jakubweg/SponsorBlockUtils.java @@ -5,11 +5,14 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.SharedPreferences; +import android.graphics.Color; import android.net.Uri; import android.preference.EditTextPreference; import android.preference.Preference; import android.preference.PreferenceCategory; import android.text.Html; +import android.text.InputType; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -40,6 +43,7 @@ import static pl.jakubweg.PlayerController.getLastKnownVideoTime; import static pl.jakubweg.PlayerController.sponsorSegmentsOfCurrentVideo; import static pl.jakubweg.SponsorBlockPreferenceFragment.FORMATTER; import static pl.jakubweg.SponsorBlockPreferenceFragment.SAVED_TEMPLATE; +import static pl.jakubweg.SponsorBlockSettings.PREFERENCES_KEY_CATEGORY_COLOR_SUFFIX; import static pl.jakubweg.SponsorBlockSettings.isSponsorBlockEnabled; import static pl.jakubweg.SponsorBlockSettings.showTimeWithoutSegments; import static pl.jakubweg.SponsorBlockSettings.skippedSegments; @@ -219,6 +223,40 @@ public abstract class SponsorBlockUtils { }) .show(); }; + public static final DialogInterface.OnClickListener categoryColorChangeClickListener = (dialog, which) -> { + SponsorBlockSettings.SegmentInfo segmentInfo = SponsorBlockSettings.SegmentInfo.valuesWithoutUnsubmitted()[which]; + String key = segmentInfo.key + PREFERENCES_KEY_CATEGORY_COLOR_SUFFIX; + + Context context = ((AlertDialog) dialog).getContext(); + EditText editText = new EditText(context); + editText.setInputType(InputType.TYPE_CLASS_TEXT); + editText.setText(formatColorString(segmentInfo.color)); + + Context applicationContext = context.getApplicationContext(); + SharedPreferences preferences = SponsorBlockSettings.getPreferences(context); + + new AlertDialog.Builder(context) + .setView(editText) + .setPositiveButton(str("change"), (dialog1, which1) -> { + try { + int color = Color.parseColor(editText.getText().toString()); + segmentInfo.setColor(color); + Toast.makeText(applicationContext, str("color_changed"), Toast.LENGTH_SHORT).show(); + preferences.edit().putString(key, formatColorString(color)).apply(); + } + catch (Exception ex) { + Toast.makeText(applicationContext, str("color_invalid"), Toast.LENGTH_SHORT).show(); + } + }) + .setNeutralButton(str("reset"), (dialog1, which1) -> { + int defaultColor = segmentInfo.defaultColor; + segmentInfo.setColor(defaultColor); + Toast.makeText(applicationContext, str("color_reset"), Toast.LENGTH_SHORT).show(); + preferences.edit().putString(key, formatColorString(defaultColor)).apply(); + }) + .setNegativeButton(android.R.string.cancel, null) + .show(); + }; private static final Runnable submitRunnable = () -> { messageToToast = null; final String uuid = SponsorBlockSettings.uuid; diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7b5ec0b..e1ae50d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -183,12 +183,13 @@ Show a skip button Don\'t do anything - Change color + Change colors + Choose the category Color changed Color reset Invalid hex code - Reset Change + Reset Stats Loading..