diff --git a/app/src/main/java/com/github/libretube/PlayerFragment.kt b/app/src/main/java/com/github/libretube/PlayerFragment.kt index f0f357369..ff1ffeaf2 100644 --- a/app/src/main/java/com/github/libretube/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/PlayerFragment.kt @@ -325,7 +325,9 @@ class PlayerFragment : Fragment() { val segmentEnd = (segment.segment[1] * 1000.0f).toLong() val currentPosition = exoPlayer.currentPosition if (currentPosition in segmentStart until segmentEnd) { - Toast.makeText(context, R.string.segment_skipped, Toast.LENGTH_SHORT).show() + if (SponsorBlockSettings.sponsorNotificationsEnabled) { + Toast.makeText(context, R.string.segment_skipped, Toast.LENGTH_SHORT).show() + } exoPlayer.seekTo(segmentEnd) } } diff --git a/app/src/main/java/com/github/libretube/SponsorBlockSettings.kt b/app/src/main/java/com/github/libretube/SponsorBlockSettings.kt index 95460bf1b..8fbfdad08 100644 --- a/app/src/main/java/com/github/libretube/SponsorBlockSettings.kt +++ b/app/src/main/java/com/github/libretube/SponsorBlockSettings.kt @@ -9,6 +9,7 @@ class SponsorBlockSettings : PreferenceFragmentCompat() { companion object { var sponsorBlockEnabled: Boolean = false + var sponsorNotificationsEnabled: Boolean = false var sponsorsEnabled: Boolean = false var selfPromoEnabled: Boolean = false var interactionEnabled: Boolean = false @@ -18,12 +19,18 @@ class SponsorBlockSettings : PreferenceFragmentCompat() { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { setPreferencesFromResource(R.xml.sponsorblock_settings, rootKey) - val sponsorBlockToggle = findPreference("sponsorblock_enabled_key") + val sponsorBlockToggle = findPreference("sb_enabled_key") sponsorBlockToggle?.setOnPreferenceChangeListener { _, newValue -> sponsorBlockEnabled = newValue as Boolean true } + val notificationsToggle = findPreference("sb_notifications_key") + notificationsToggle?.setOnPreferenceChangeListener { _, newValue -> + sponsorNotificationsEnabled = newValue as Boolean + true + } + val sponsorToggle = findPreference("sponsors_category_key") sponsorToggle?.setOnPreferenceChangeListener { _, newValue -> sponsorsEnabled = newValue as Boolean diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9d8b3ab40..80ead00f8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -109,4 +109,5 @@ Purple OLED Theme Material You + Notifications \ No newline at end of file diff --git a/app/src/main/res/xml/sponsorblock_settings.xml b/app/src/main/res/xml/sponsorblock_settings.xml index 09dd7ecf7..d56859e64 100644 --- a/app/src/main/res/xml/sponsorblock_settings.xml +++ b/app/src/main/res/xml/sponsorblock_settings.xml @@ -4,9 +4,13 @@ + + @@ -37,4 +41,5 @@ app:summary="@string/category_outro_description"/> +