diff --git a/README.md b/README.md index 875c1b99c..b831eb9b5 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,16 @@
- LibreTube -

LibreTube

-

Alternative YouTube frontend for Android
built with Piped

+ LibreTube - -[![GPL-v3](https://shields.io/badge/License-GPL%20v3-red.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) -[![Matrix](https://img.shields.io/matrix/LibreTube:matrix.org)](https://matrix.to/#/#LibreTube:matrix.org) -[![Telegram](https://img.shields.io/endpoint?color=neon&style=flat-square&url=https://tg.sumanjay.workers.dev/libretube)](https://t.me/libretube) -[![Twitter](https://img.shields.io/twitter/follow/libretube?style=social)](https://twitter.com/libretube) -[![Reddit](https://img.shields.io/reddit/subreddit-subscribers/libretube?style=social)](https://www.reddit.com/r/Libretube/) +[![GPL-v3](https://libre-tube.github.io/assets/license-widget.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html) +[![Matrix](https://libre-tube.github.io/assets/mat-widget.svg)](https://matrix.to/#/#LibreTube:matrix.org) +[![Telegram](https://libre-tube.github.io/assets/tg-widget.svg)](https://t.me/libretube) +[![Twitter](https://libre-tube.github.io/assets/tw-widget.svg)](https://twitter.com/libretube) +[![Reddit](https://libre-tube.github.io/assets/rd-widget.svg)](https://www.reddit.com/r/Libretube/) -[Get it on F-Droid](https://f-droid.org/en/packages/com.github.libretube/) -[Get it on GitHub](https://github.com/libre-tube/LibreTube/releases/latest) +[Get it on F-Droid](https://f-droid.org/en/packages/com.github.libretube/) +[Get it on GitHub](https://github.com/libre-tube/LibreTube/releases/latest) +[Get it on GitHub](https://t.me/LibreTube)
-WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY. ## Screenshots @@ -44,6 +41,8 @@ WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OP ## Contributing Whether you have ideas, translations, design changes, code cleaning, or real heavy code changes, help is always welcome. The more is done the better it gets! +WARNING: THIS IS A BETA VERSION, THEREFORE YOU MAY ENCOUNTER BUGS. IF YOU DO, OPEN AN ISSUE VIA OUR GITHUB REPOSITORY. + ### Translation Translation status 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/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml index 2b068d114..8bb9833ba 100644 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -4,27 +4,27 @@ android:height="108dp" android:viewportWidth="108" android:viewportHeight="108"> - - - - - - - + + + + + + + + + - \ No newline at end of file + android:pathData="M614.7,631.1C621.4,634.9 621.4,644.7 614.7,648.5L494.9,716.4C488.3,720.2 480,715.3 480,707.7V571.9C480,564.2 488.3,559.4 494.9,563.2L614.7,631.1Z" + android:fillColor="#F2EEFF"/> + + diff --git a/app/src/main/res/drawable/ic_libretube_background.xml b/app/src/main/res/drawable/ic_libretube_background.xml deleted file mode 100644 index ca3826a46..000000000 --- a/app/src/main/res/drawable/ic_libretube_background.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_libretube_foreground.xml b/app/src/main/res/drawable/ic_libretube_foreground.xml deleted file mode 100644 index d5e5d703f..000000000 --- a/app/src/main/res/drawable/ic_libretube_foreground.xml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_addtoplaylist.xml b/app/src/main/res/layout/dialog_addtoplaylist.xml index ac22b5eba..534f719bf 100644 --- a/app/src/main/res/layout/dialog_addtoplaylist.xml +++ b/app/src/main/res/layout/dialog_addtoplaylist.xml @@ -34,6 +34,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/addToPlaylist" + android:textColor="?attr/colorSurface" android:padding="8dp" android:layout_margin="8dp"/> diff --git a/app/src/main/res/layout/dialog_create_playlist.xml b/app/src/main/res/layout/dialog_create_playlist.xml index 2ffe670a3..f921ef2f6 100644 --- a/app/src/main/res/layout/dialog_create_playlist.xml +++ b/app/src/main/res/layout/dialog_create_playlist.xml @@ -49,6 +49,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/cancel" + android:textColor="?attr/colorSurface" android:padding="8dp" android:layout_margin="8dp"/>