From b6c7a2ad3f7a3c2e63728c6d41d869d20b85e671 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sun, 22 May 2022 20:37:09 +0200 Subject: [PATCH 1/3] SponsorBlock Notifications Toggle --- app/src/main/java/com/github/libretube/PlayerFragment.kt | 5 ++++- .../main/java/com/github/libretube/SponsorBlockSettings.kt | 7 +++++++ app/src/main/res/values/strings.xml | 1 + app/src/main/res/xml/sponsorblock_settings.xml | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/github/libretube/PlayerFragment.kt b/app/src/main/java/com/github/libretube/PlayerFragment.kt index f0f357369..c14ff8432 100644 --- a/app/src/main/java/com/github/libretube/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/PlayerFragment.kt @@ -68,6 +68,7 @@ import com.google.android.exoplayer2.util.RepeatModeUtil import com.google.android.material.button.MaterialButton import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.squareup.picasso.Picasso +import org.chromium.base.ThreadUtils.runOnUiThread import java.io.IOException import java.net.URLEncoder import java.util.concurrent.Executors @@ -325,7 +326,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..3d78a8bb1 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 @@ -24,6 +25,12 @@ class SponsorBlockSettings : PreferenceFragmentCompat() { true } + val sponsorBlockNotificationsToggle = findPreference("sponsorblock_notifications_key") + sponsorBlockNotificationsToggle?.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..37b861462 100644 --- a/app/src/main/res/xml/sponsorblock_settings.xml +++ b/app/src/main/res/xml/sponsorblock_settings.xml @@ -7,6 +7,10 @@ app:key="sponsorblock_enabled_key" app:title="@string/sponsorblock_state"/> + + @@ -37,4 +41,5 @@ app:summary="@string/category_outro_description"/> + From 7acd88aa5187b8e436d5f807927b04b6b48ee3d0 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sun, 22 May 2022 20:43:12 +0200 Subject: [PATCH 2/3] ktlint --- app/src/main/java/com/github/libretube/PlayerFragment.kt | 2 +- .../main/java/com/github/libretube/SponsorBlockSettings.kt | 6 +++--- app/src/main/res/xml/sponsorblock_settings.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/github/libretube/PlayerFragment.kt b/app/src/main/java/com/github/libretube/PlayerFragment.kt index c14ff8432..902cd4ddf 100644 --- a/app/src/main/java/com/github/libretube/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/PlayerFragment.kt @@ -68,11 +68,11 @@ import com.google.android.exoplayer2.util.RepeatModeUtil import com.google.android.material.button.MaterialButton import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.squareup.picasso.Picasso -import org.chromium.base.ThreadUtils.runOnUiThread import java.io.IOException import java.net.URLEncoder import java.util.concurrent.Executors import kotlin.math.abs +import org.chromium.base.ThreadUtils.runOnUiThread import org.chromium.net.CronetEngine import retrofit2.HttpException diff --git a/app/src/main/java/com/github/libretube/SponsorBlockSettings.kt b/app/src/main/java/com/github/libretube/SponsorBlockSettings.kt index 3d78a8bb1..8fbfdad08 100644 --- a/app/src/main/java/com/github/libretube/SponsorBlockSettings.kt +++ b/app/src/main/java/com/github/libretube/SponsorBlockSettings.kt @@ -19,14 +19,14 @@ 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 sponsorBlockNotificationsToggle = findPreference("sponsorblock_notifications_key") - sponsorBlockNotificationsToggle?.setOnPreferenceChangeListener { _, newValue -> + val notificationsToggle = findPreference("sb_notifications_key") + notificationsToggle?.setOnPreferenceChangeListener { _, newValue -> sponsorNotificationsEnabled = newValue as Boolean true } diff --git a/app/src/main/res/xml/sponsorblock_settings.xml b/app/src/main/res/xml/sponsorblock_settings.xml index 37b861462..d56859e64 100644 --- a/app/src/main/res/xml/sponsorblock_settings.xml +++ b/app/src/main/res/xml/sponsorblock_settings.xml @@ -4,11 +4,11 @@ From a464afeab01fffd870b02408f16c297694c6dd75 Mon Sep 17 00:00:00 2001 From: Bnyro Date: Sun, 22 May 2022 20:56:49 +0200 Subject: [PATCH 3/3] Import removed --- app/src/main/java/com/github/libretube/PlayerFragment.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/com/github/libretube/PlayerFragment.kt b/app/src/main/java/com/github/libretube/PlayerFragment.kt index 902cd4ddf..ff1ffeaf2 100644 --- a/app/src/main/java/com/github/libretube/PlayerFragment.kt +++ b/app/src/main/java/com/github/libretube/PlayerFragment.kt @@ -72,7 +72,6 @@ import java.io.IOException import java.net.URLEncoder import java.util.concurrent.Executors import kotlin.math.abs -import org.chromium.base.ThreadUtils.runOnUiThread import org.chromium.net.CronetEngine import retrofit2.HttpException