ReVanced-Mirror/revanced-integrations
1
0
Fork 0
mirror of https://github.com/revanced/revanced-integrations.git synced 2025-01-08 11:05:49 +01:00
Code Issues Projects Releases Wiki Activity

chore: Merge branch dev to main (#494)

Browse Source
This commit is contained in:
oSumAtrIX 2023-10-09 18:59:05 +02:00 committed by GitHub
commit 49d9bf80f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@ -1,3 +1,10 @@
## [0.119.1-dev.1](https://github.com/ReVanced/revanced-integrations/compare/v0.119.0...v0.119.1-dev.1) (2023-10-08)
### Bug Fixes
* **YouTube - Hide shorts components:** Do not hide subscribe button outside of Shorts ([1479d6b](https://github.com/ReVanced/revanced-integrations/commit/1479d6bc2668758ea55f9d640684547f710099f0))
# [0.119.0](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0...v0.119.0) (2023-10-08) # [0.119.0](https://github.com/ReVanced/revanced-integrations/compare/v0.118.0...v0.119.0) (2023-10-08)

13
app/src/main/java/app/revanced/integrations/patches/components/ShortsFilter.java
View File

@ -10,6 +10,7 @@ import com.google.android.libraries.youtube.rendering.ui.pivotbar.PivotBar;
import static app.revanced.integrations.utils.ReVancedUtils.hideViewBy1dpUnderCondition; import static app.revanced.integrations.utils.ReVancedUtils.hideViewBy1dpUnderCondition;
import static app.revanced.integrations.utils.ReVancedUtils.hideViewUnderCondition; import static app.revanced.integrations.utils.ReVancedUtils.hideViewUnderCondition;
/** @noinspection unused*/
@RequiresApi(api = Build.VERSION_CODES.N) @RequiresApi(api = Build.VERSION_CODES.N)
public final class ShortsFilter extends Filter { public final class ShortsFilter extends Filter {
public static PivotBar pivotBar; // Set by patch. public static PivotBar pivotBar; // Set by patch.
@ -117,20 +118,24 @@ public final class ShortsFilter extends Filter {
if (matchedGroup == soundButton || if (matchedGroup == soundButton ||
matchedGroup == infoPanel || matchedGroup == infoPanel ||
matchedGroup == channelBar || matchedGroup == channelBar ||
matchedGroup == subscribeButton ||
matchedGroup == subscribeButtonPaused matchedGroup == subscribeButtonPaused
) return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex); ) return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex);
// Video action buttons (comment, share, remix) have the same path. // Video action buttons (comment, share, remix) have the same path.
if (matchedGroup == videoActionButton) { if (matchedGroup == videoActionButton) {
if (videoActionButtonGroupList.check(protobufBufferArray).isFiltered()) if (videoActionButtonGroupList.check(protobufBufferArray).isFiltered()) return super.isFiltered(
return super.isFiltered(identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex); identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex
);
return false; return false;
} }
// Filter other path groups from pathFilterGroupList, only when reelChannelBar is visible // Filter other path groups from pathFilterGroupList, only when reelChannelBar is visible
// to avoid false positives. // to avoid false positives.
if (!path.startsWith(REEL_CHANNEL_BAR_PATH)) if (path.startsWith(REEL_CHANNEL_BAR_PATH))
if (matchedGroup == subscribeButton) return super.isFiltered(
identifier, path, protobufBufferArray, matchedList, matchedGroup, matchedIndex
);
return false; return false;
} else if (matchedGroup == shelfHeader) { } else if (matchedGroup == shelfHeader) {
// Because the header is used in watch history and possibly other places, check for the index, // Because the header is used in watch history and possibly other places, check for the index,

2
gradle.properties
View File

@ -1,4 +1,4 @@
org.gradle.parallel = true org.gradle.parallel = true
org.gradle.caching = true org.gradle.caching = true
android.useAndroidX = true android.useAndroidX = true
version = 0.119.0 version = 0.119.1-dev.1