From 1dd84a37851359143140d1d1df664c3eab680fa7 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Sat, 11 Feb 2023 01:25:48 +0100 Subject: [PATCH 1/2] fix(youtube/minimized-playback): disable when playing shorts Signed-off-by: oSumAtrIX --- .../integrations/patches/MinimizedPlaybackPatch.java | 5 +++++ .../java/app/revanced/integrations/shared/PlayerType.kt | 7 +++++++ 2 files changed, 12 insertions(+) diff --git a/app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java b/app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java index 51303966..b4ec200f 100644 --- a/app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java +++ b/app/src/main/java/app/revanced/integrations/patches/MinimizedPlaybackPatch.java @@ -1,9 +1,14 @@ package app.revanced.integrations.patches; import app.revanced.integrations.settings.SettingsEnum; +import app.revanced.integrations.shared.PlayerType; public class MinimizedPlaybackPatch { + public static boolean isNotPlayingShorts(boolean isPipEnabled) { + return !PlayerType.getCurrent().isNoneOrHidden() && isPipEnabled; + } + public static boolean isMinimizedPlaybackEnabled() { return SettingsEnum.ENABLE_MINIMIZED_PLAYBACK.getBoolean(); } diff --git a/app/src/main/java/app/revanced/integrations/shared/PlayerType.kt b/app/src/main/java/app/revanced/integrations/shared/PlayerType.kt index 561b3840..490f14d1 100644 --- a/app/src/main/java/app/revanced/integrations/shared/PlayerType.kt +++ b/app/src/main/java/app/revanced/integrations/shared/PlayerType.kt @@ -49,4 +49,11 @@ enum class PlayerType { */ val onChange = Event() } + + /** + * Weather Shorts are being played. + */ + fun isNoneOrHidden(): Boolean { + return this == NONE || this == HIDDEN + } } \ No newline at end of file From 1864372298a208d3ceb3319667e529177d49f1d3 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Sat, 11 Feb 2023 00:27:39 +0000 Subject: [PATCH 2/2] chore(release): 0.96.1-dev.1 [skip ci] ## [0.96.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.96.0...v0.96.1-dev.1) (2023-02-11) ### Bug Fixes * **youtube/minimized-playback:** disable when playing shorts ([1dd84a3](https://github.com/revanced/revanced-integrations/commit/1dd84a37851359143140d1d1df664c3eab680fa7)) --- CHANGELOG.md | 7 +++++++ gradle.properties | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3636e8f..4d6b0af2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [0.96.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.96.0...v0.96.1-dev.1) (2023-02-11) + + +### Bug Fixes + +* **youtube/minimized-playback:** disable when playing shorts ([1dd84a3](https://github.com/revanced/revanced-integrations/commit/1dd84a37851359143140d1d1df664c3eab680fa7)) + # [0.96.0](https://github.com/revanced/revanced-integrations/compare/v0.95.0...v0.96.0) (2023-02-10) diff --git a/gradle.properties b/gradle.properties index 033099f6..1ff337ce 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.jvmargs = -Xmx2048m android.useAndroidX = true -version = 0.96.0 +version = 0.96.1-dev.1