kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 00:10:32 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #282 from Bnyro/sb

Browse Source 
SponsorBlock Notifications Toggle
This commit is contained in:
Bnyro 2022-05-22 19:15:40 +02:00 committed by GitHub
commit f052a83bff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/github/libretube/PlayerFragment.kt
View File

@ -325,7 +325,9 @@ class PlayerFragment : Fragment() {
val segmentEnd = (segment.segment[1] * 1000.0f).toLong() val segmentEnd = (segment.segment[1] * 1000.0f).toLong()
val currentPosition = exoPlayer.currentPosition val currentPosition = exoPlayer.currentPosition
if (currentPosition in segmentStart until segmentEnd) { 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) exoPlayer.seekTo(segmentEnd)
} }
} }

9
app/src/main/java/com/github/libretube/SponsorBlockSettings.kt
View File

@ -9,6 +9,7 @@ class SponsorBlockSettings : PreferenceFragmentCompat() {
companion object { companion object {
var sponsorBlockEnabled: Boolean = false var sponsorBlockEnabled: Boolean = false
var sponsorNotificationsEnabled: Boolean = false
var sponsorsEnabled: Boolean = false var sponsorsEnabled: Boolean = false
var selfPromoEnabled: Boolean = false var selfPromoEnabled: Boolean = false
var interactionEnabled: Boolean = false var interactionEnabled: Boolean = false
@ -18,12 +19,18 @@ class SponsorBlockSettings : PreferenceFragmentCompat() {
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) { override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
setPreferencesFromResource(R.xml.sponsorblock_settings, rootKey) setPreferencesFromResource(R.xml.sponsorblock_settings, rootKey)
val sponsorBlockToggle = findPreference<SwitchPreferenceCompat>("sponsorblock_enabled_key") val sponsorBlockToggle = findPreference<SwitchPreferenceCompat>("sb_enabled_key")
sponsorBlockToggle?.setOnPreferenceChangeListener { _, newValue -> sponsorBlockToggle?.setOnPreferenceChangeListener { _, newValue ->
sponsorBlockEnabled = newValue as Boolean sponsorBlockEnabled = newValue as Boolean
true true
} }
val notificationsToggle = findPreference<SwitchPreferenceCompat>("sb_notifications_key")
notificationsToggle?.setOnPreferenceChangeListener { _, newValue ->
sponsorNotificationsEnabled = newValue as Boolean
true
}
val sponsorToggle = findPreference<SwitchPreferenceCompat>("sponsors_category_key") val sponsorToggle = findPreference<SwitchPreferenceCompat>("sponsors_category_key")
sponsorToggle?.setOnPreferenceChangeListener { _, newValue -> sponsorToggle?.setOnPreferenceChangeListener { _, newValue ->
sponsorsEnabled = newValue as Boolean sponsorsEnabled = newValue as Boolean

1
app/src/main/res/values/strings.xml
View File

@ -109,4 +109,5 @@
<string name="color_purple">Purple</string> <string name="color_purple">Purple</string>
<string name="oledTheme">OLED Theme</string> <string name="oledTheme">OLED Theme</string>
<string name="material_you">Material You</string> <string name="material_you">Material You</string>
<string name="sponsorblock_notifications">Notifications</string>
</resources> </resources>

7
app/src/main/res/xml/sponsorblock_settings.xml
View File

@ -4,9 +4,13 @@
<PreferenceCategory app:title="@string/sponsorblock"> <PreferenceCategory app:title="@string/sponsorblock">
<SwitchPreferenceCompat <SwitchPreferenceCompat
app:key="sponsorblock_enabled_key" app:key="sb_enabled_key"
app:title="@string/sponsorblock_state"/> app:title="@string/sponsorblock_state"/>
<SwitchPreferenceCompat
app:key="sb_notifications_key"
app:title="@string/sponsorblock_notifications"/>
</PreferenceCategory> </PreferenceCategory>
<PreferenceCategory app:title="@string/category_segments"> <PreferenceCategory app:title="@string/category_segments">
@ -37,4 +41,5 @@
app:summary="@string/category_outro_description"/> app:summary="@string/category_outro_description"/>
</PreferenceCategory> </PreferenceCategory>
</androidx.preference.PreferenceScreen> </androidx.preference.PreferenceScreen>