diff --git a/CHANGELOG.md b/CHANGELOG.md index 93beb5b0..209b767f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,26 @@ +# [0.104.0-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.103.1-dev.2...v0.104.0-dev.1) (2023-04-24) + + +### Features + +* **youtube/wide-searchbar:** rename patch ([2320880](https://github.com/revanced/revanced-integrations/commit/2320880a42bf37335ececf1f8e6cb83bd57f347d)) +* **youtube:** bump compatibility to `18.15.40` ([#367](https://github.com/revanced/revanced-integrations/issues/367)) ([52a3193](https://github.com/revanced/revanced-integrations/commit/52a31930870b838e766d08c3203bd8cd7ae443ba)) +* **youtube:** remove non working patch `hide-my-mix` ([98edcdd](https://github.com/revanced/revanced-integrations/commit/98edcdd589c0d3615530b44c8bbaeb94ae599afb)) + +## [0.103.1-dev.2](https://github.com/revanced/revanced-integrations/compare/v0.103.1-dev.1...v0.103.1-dev.2) (2023-04-23) + + +### Bug Fixes + +* **youtube/hide-video-action-buttons:** fix hide action buttons not working for some users ([#366](https://github.com/revanced/revanced-integrations/issues/366)) ([afd9b6e](https://github.com/revanced/revanced-integrations/commit/afd9b6e30566d735075c16d3f5173e406c965a8c)) + +## [0.103.1-dev.1](https://github.com/revanced/revanced-integrations/compare/v0.103.0...v0.103.1-dev.1) (2023-04-22) + + +### Bug Fixes + +* **youtube/sponsorblock:** Include milliseconds in the voting menu ([#362](https://github.com/revanced/revanced-integrations/issues/362)) ([1ada30d](https://github.com/revanced/revanced-integrations/commit/1ada30d5c925f1b0f21d45865240780e4ecd84d7)) + # [0.103.0](https://github.com/revanced/revanced-integrations/compare/v0.102.0...v0.103.0) (2023-04-21) diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 4ed549ed..21432998 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -20,6 +20,8 @@ # hide the original source file name. #-renamesourcefileattribute SourceFile -dontobfuscate +-dontoptimize +-keepattributes * # https://www.guardsquare.com/manual/configuration/attributes -keep class app.revanced.** { *; } diff --git a/app/src/main/java/app/revanced/integrations/patches/ButtonsPatch.java b/app/src/main/java/app/revanced/integrations/patches/ButtonsPatch.java index 621b04c3..b9897c10 100644 --- a/app/src/main/java/app/revanced/integrations/patches/ButtonsPatch.java +++ b/app/src/main/java/app/revanced/integrations/patches/ButtonsPatch.java @@ -11,7 +11,8 @@ final class ButtonsPatch extends Filter { new BlockRule(SettingsEnum.HIDE_LIKE_DISLIKE_BUTTON, "|like_button", "dislike_button"), new BlockRule(SettingsEnum.HIDE_DOWNLOAD_BUTTON, "download_button"), new BlockRule(SettingsEnum.HIDE_PLAYLIST_BUTTON, "save_to_playlist_button"), - new BlockRule(SettingsEnum.HIDE_ACTION_BUTTONS, "ContainerType|video_action_button") + new BlockRule(SettingsEnum.HIDE_CLIP_BUTTON, "|clip_button.eml|"), + new BlockRule(SettingsEnum.HIDE_ACTION_BUTTONS, "ContainerType|video_action_button", "|CellType|CollectionType|CellType|ContainerType|button.eml|") ); } diff --git a/app/src/main/java/app/revanced/integrations/patches/HideMixPlaylistsPatch.java b/app/src/main/java/app/revanced/integrations/patches/HideMixPlaylistsPatch.java deleted file mode 100644 index 6148dbee..00000000 --- a/app/src/main/java/app/revanced/integrations/patches/HideMixPlaylistsPatch.java +++ /dev/null @@ -1,14 +0,0 @@ -package app.revanced.integrations.patches; - -import android.view.View; - -import app.revanced.integrations.adremover.AdRemoverAPI; -import app.revanced.integrations.settings.SettingsEnum; - -public class HideMixPlaylistsPatch { - - public static void hideMixPlaylists(View view) { - if (!SettingsEnum.HIDE_MIX_PLAYLISTS.getBoolean()) return; - AdRemoverAPI.HideViewWithLayout1dp(view); - } -} diff --git a/app/src/main/java/app/revanced/integrations/patches/NewActionbarPatch.java b/app/src/main/java/app/revanced/integrations/patches/NewActionbarPatch.java deleted file mode 100644 index 1908a935..00000000 --- a/app/src/main/java/app/revanced/integrations/patches/NewActionbarPatch.java +++ /dev/null @@ -1,12 +0,0 @@ -package app.revanced.integrations.patches; - -import app.revanced.integrations.settings.SettingsEnum; - -public class NewActionbarPatch { - - //Used by app.revanced.patches.youtube.layout.widesearchbar.patch.WideSearchbarPatch - public static boolean getNewActionBar() { - return SettingsEnum.WIDE_SEARCHBAR.getBoolean(); // TODO: maybe this has to be inverted - } - -} diff --git a/app/src/main/java/app/revanced/integrations/patches/WideSearchbarPatch.java b/app/src/main/java/app/revanced/integrations/patches/WideSearchbarPatch.java new file mode 100644 index 00000000..21701986 --- /dev/null +++ b/app/src/main/java/app/revanced/integrations/patches/WideSearchbarPatch.java @@ -0,0 +1,9 @@ +package app.revanced.integrations.patches; + +import app.revanced.integrations.settings.SettingsEnum; + +public final class WideSearchbarPatch { + public static boolean enableWideSearchbar() { + return SettingsEnum.WIDE_SEARCHBAR.getBoolean(); + } +} diff --git a/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java b/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java index 5c742833..bd4f5a3d 100644 --- a/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java +++ b/app/src/main/java/app/revanced/integrations/settings/SettingsEnum.java @@ -74,6 +74,7 @@ public enum SettingsEnum { HIDE_LIKE_DISLIKE_BUTTON("revanced_hide_like_dislike_button", BOOLEAN, FALSE), HIDE_DOWNLOAD_BUTTON("revanced_hide_download_button", BOOLEAN, FALSE), HIDE_PLAYLIST_BUTTON("revanced_hide_playlist_button", BOOLEAN, FALSE), + HIDE_CLIP_BUTTON("revanced_hide_clip_button", BOOLEAN, FALSE, "revanced_hide_clip_button_user_dialog_message"), HIDE_ACTION_BUTTONS("revanced_hide_action_buttons", BOOLEAN, FALSE), // Layout settings @@ -92,7 +93,6 @@ public enum SettingsEnum { HIDE_FLOATING_MICROPHONE_BUTTON("revanced_hide_floating_microphone_button", BOOLEAN, TRUE, true), HIDE_FULLSCREEN_PANELS("revanced_hide_fullscreen_panels", BOOLEAN, TRUE), HIDE_INFO_CARDS("revanced_hide_infocards", BOOLEAN, TRUE), - HIDE_MIX_PLAYLISTS("revanced_hide_mix_playlists", BOOLEAN, FALSE, true), HIDE_PLAYER_BUTTONS("revanced_hide_player_buttons", BOOLEAN, FALSE), HIDE_PREVIEW_COMMENT("revanced_hide_preview_comment", BOOLEAN, FALSE, true), HIDE_SEEKBAR("revanced_hide_seekbar", BOOLEAN, FALSE), diff --git a/app/src/main/java/app/revanced/integrations/sponsorblock/SponsorBlockUtils.java b/app/src/main/java/app/revanced/integrations/sponsorblock/SponsorBlockUtils.java index 6a19c0d3..cea3360f 100644 --- a/app/src/main/java/app/revanced/integrations/sponsorblock/SponsorBlockUtils.java +++ b/app/src/main/java/app/revanced/integrations/sponsorblock/SponsorBlockUtils.java @@ -300,13 +300,13 @@ public class SponsorBlockUtils { final long currentVideoLength = VideoInformation.getCurrentVideoLength(); final String formatPattern; if (currentVideoLength < (10 * 60 * 1000)) { - formatPattern = "m:ss"; // less than 10 minutes + formatPattern = "m:ss.SSS"; // less than 10 minutes } else if (currentVideoLength < (60 * 60 * 1000)) { - formatPattern = "mm:ss"; // less than 1 hour + formatPattern = "mm:ss.SSS"; // less than 1 hour } else if (currentVideoLength < (10 * 60 * 60 * 1000)) { - formatPattern = "H:mm:ss"; // less than 10 hours + formatPattern = "H:mm:ss.SSS"; // less than 10 hours } else { - formatPattern = "HH:mm:ss"; // why is this on YouTube + formatPattern = "HH:mm:ss.SSS"; // why is this on YouTube } voteSegmentTimeFormatter.applyPattern(formatPattern); diff --git a/gradle.properties b/gradle.properties index 5fef7734..ed99ac50 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ org.gradle.jvmargs = -Xmx2048m android.useAndroidX = true -version = 0.103.0 +version = 0.104.0-dev.1