Merge remote-tracking branch 'upstream/dev' into revanced_about_screen

CHANGELOG.md

@@ -1,3 +1,17 @@
+# [1.8.0-dev.5](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.4...v1.8.0-dev.5) (2024-04-10)
+
+
+### Bug Fixes
+
+* **YouTube - Return YouTube Dislike:** Do not clip compact text when not using English ([eeaeb49](https://github.com/ReVanced/revanced-integrations/commit/eeaeb49f2a562d2690dae184153c303a5b1c4368))
+
+# [1.8.0-dev.4](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.3...v1.8.0-dev.4) (2024-04-10)
+
+
+### Bug Fixes
+
+* **YouTube - Hide Shorts components:** Correctly hide Shorts if navigation tab is changed using device back button ([#611](https://github.com/ReVanced/revanced-integrations/issues/611)) ([ffc3437](https://github.com/ReVanced/revanced-integrations/commit/ffc3437843c24af255d2a0dda9930d2843cac4b6))
+
 # [1.8.0-dev.3](https://github.com/ReVanced/revanced-integrations/compare/v1.8.0-dev.2...v1.8.0-dev.3) (2024-04-09)
 
 

app/src/main/java/app/revanced/integrations/youtube/patches/ReturnYouTubeDislikePatch.java

@@ -176,12 +176,6 @@ public class ReturnYouTubeDislikePatch {
             textView.removeTextChangedListener(oldUiTextWatcher);
             textView.addTextChangedListener(oldUiTextWatcher);
 
-            /**
-             * If the patch is changed to include the dislikes button as a parameter to this method,
-             * then if the button is already selected the dislikes could be adjusted using
-             * {@link ReturnYouTubeDislike#setUserVote(Vote)}
-             */
-
             updateOldUIDislikesTextView();
 
         } catch (Exception ex) {
@@ -314,19 +308,25 @@ public class ReturnYouTubeDislikePatch {
      */
     public static float onRollingNumberMeasured(String text, float measuredTextWidth) {
         try {
-            if (Settings.RYD_ENABLED.get() && !Settings.RYD_COMPACT_LAYOUT.get()) {
+            if (Settings.RYD_ENABLED.get()) {
                 if (ReturnYouTubeDislike.isPreviouslyCreatedSegmentedSpan(text)) {
                     // +1 pixel is needed for some foreign languages that measure
                     // the text different from what is used for layout (Greek in particular).
                     // Probably a bug in Android, but who knows.
                     // Single line mode is also used as an additional fix for this issue.
-                    return measuredTextWidth + ReturnYouTubeDislike.leftSeparatorBounds.right
-                            + ReturnYouTubeDislike.leftSeparatorShapePaddingPixels + 1;
+                    if (Settings.RYD_COMPACT_LAYOUT.get()) {
+                        return measuredTextWidth + 1;
+                    }
+
+                    return measuredTextWidth + 1
+                            + ReturnYouTubeDislike.leftSeparatorBounds.right
+                            + ReturnYouTubeDislike.leftSeparatorShapePaddingPixels;
                 }
             }
         } catch (Exception ex) {
             Logger.printException(() -> "onRollingNumberMeasured failure", ex);
         }
+
         return measuredTextWidth;
     }
 
@@ -344,10 +344,12 @@ public class ReturnYouTubeDislikePatch {
             } else {
                 view.setCompoundDrawables(separator, null, null, null);
             }
+
             // Disliking can cause the span to grow in size, which is ok and is laid out correctly,
             // but if the user then removes their dislike the layout will not adjust to the new shorter width.
             // Use a center alignment to take up any extra space.
             view.setTextAlignment(View.TEXT_ALIGNMENT_CENTER);
+
             // Single line mode does not clip words if the span is larger than the view bounds.
             // The styled span applied to the view should always have the same bounds,
             // but use this feature just in case the measurements are somehow off by a few pixels.

app/src/main/java/app/revanced/integrations/youtube/patches/components/ShortsFilter.java

@@ -220,20 +220,34 @@ public final class ShortsFilter extends Filter {
     }
 
     private static boolean shouldHideShortsFeedItems() {
+        final boolean hideHome = Settings.HIDE_SHORTS_HOME.get();
+        final boolean hideSubscriptions = Settings.HIDE_SHORTS_SUBSCRIPTIONS.get();
+        final boolean hideSearch = Settings.HIDE_SHORTS_SEARCH.get();
+
+        if (hideHome && hideSubscriptions && hideSearch) {
+            // Shorts suggestions can load in the background if a video is opened and
+            // then immediately minimized before any suggestions are loaded.
+            // In this state the player type will show minimized, which makes it not possible to
+            // distinguish between Shorts suggestions loading in the player and between
+            // scrolling thru search/home/subscription tabs while a player is minimized.
+            //
+            // To avoid this situation for users that never want to show Shorts (all hide Shorts options are enabled)
+            // then hide all Shorts everywhere including the Library history and Library playlists.
+            return true;
+        }
+
         // Must check player type first, as search bar can be active behind the player.
         if (PlayerType.getCurrent().isMaximizedOrFullscreen()) {
             // For now, consider the under video results the same as the home feed.
-            return Settings.HIDE_SHORTS_HOME.get();
+            return hideHome;
         }
 
         // Must check second, as search can be from any tab.
         if (NavigationBar.isSearchBarActive()) {
-            return Settings.HIDE_SHORTS_SEARCH.get();
+            return hideSearch;
         }
 
-        // Avoid checking navigation button status if all other settings are off.
-        final boolean hideHome = Settings.HIDE_SHORTS_HOME.get();
-        final boolean hideSubscriptions = Settings.HIDE_SHORTS_SUBSCRIPTIONS.get();
+        // Avoid checking navigation button status if all other Shorts should show.
         if (!hideHome && !hideSubscriptions) {
             return false;
         }

app/src/main/java/app/revanced/integrations/youtube/shared/NavigationBar.java

@@ -197,6 +197,10 @@ public final class NavigationBar {
      */
     public static void navigationTabSelected(View navButtonImageView, boolean isSelected) {
         try {
+            if (!isSelected) {
+                return;
+            }
+
             NavigationButton button = viewToButtonMap.get(navButtonImageView);
 
             if (button == null) { // An unknown tab was selected.
@@ -209,16 +213,11 @@ public final class NavigationBar {
                 return;
             }
 
-            if (isSelected) {
-                NavigationButton.selectedNavigationButton = button;
-                Logger.printDebug(() -> "Changed to navigation button: " + button);
+            NavigationButton.selectedNavigationButton = button;
+            Logger.printDebug(() -> "Changed to navigation button: " + button);
 
-                // Release any threads waiting for the selected nav button.
-                releaseNavButtonLatch();
-            } else if (NavigationButton.selectedNavigationButton == button) {
-                NavigationButton.selectedNavigationButton = null;
-                Logger.printDebug(() -> "Navigated away from button: " + button);
-            }
+            // Release any threads waiting for the selected nav button.
+            releaseNavButtonLatch();
         } catch (Exception ex) {
             Logger.printException(() -> "navigationTabSelected failure", ex);
         }

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 android.useAndroidX = true
-version = 1.8.0-dev.3
+version = 1.8.0-dev.5