fix: Add scrollable content to modern style settings dialogs

This fix dialog layout to prevent buttons from being pushed off-screen

Author: MarcaDian

extensions/shared/library/src/main/java/app/revanced/extension/shared/Utils.java

@@ -42,6 +42,7 @@
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
+import android.widget.ScrollView;
 import android.widget.TextView;
 import android.widget.Toast;
 import android.widget.Toolbar;
@@ -773,16 +774,15 @@ public static Pair<Dialog, LinearLayout> createCustomDialog(
         Dialog dialog = new Dialog(context);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE); // Remove default title bar.
 
-        // Create main layout.
-        LinearLayout mainLayout = new LinearLayout(context);
-        mainLayout.setOrientation(LinearLayout.VERTICAL);
-
         // Preset size constants.
         final int dip4 = dipToPixels(4);
         final int dip8 = dipToPixels(8);
         final int dip16 = dipToPixels(16);
         final int dip24 = dipToPixels(24);
 
+        // Create main layout.
+        LinearLayout mainLayout = new LinearLayout(context);
+        mainLayout.setOrientation(LinearLayout.VERTICAL);
         mainLayout.setPadding(dip24, dip16, dip24, dip24);
         // Set rounded rectangle background.
         ShapeDrawable mainBackground = new ShapeDrawable(new RoundRectShape(
@@ -807,6 +807,18 @@ public static Pair<Dialog, LinearLayout> createCustomDialog(
             mainLayout.addView(titleView);
         }
 
+        // Create content container (message/EditText) inside a ScrollView.
+        ScrollView contentScrollView = new ScrollView(context);
+        LinearLayout contentContainer = new LinearLayout(context);
+        contentContainer.setOrientation(LinearLayout.VERTICAL);
+        LinearLayout.LayoutParams contentParams = new LinearLayout.LayoutParams(
+                ViewGroup.LayoutParams.MATCH_PARENT,
+                0,
+                1.0f // Weight to take available space.
+        );
+        contentScrollView.setLayoutParams(contentParams);
+        contentScrollView.addView(contentContainer);
+
         // Message (if not replaced by EditText).
         if (editText == null && message != null) {
             TextView messageView = new TextView(context);
@@ -821,9 +833,9 @@ public static Pair<Dialog, LinearLayout> createCustomDialog(
                     ViewGroup.LayoutParams.MATCH_PARENT,
                     ViewGroup.LayoutParams.WRAP_CONTENT
             );
-            messageParams.setMargins(0, dip8, 0, dip16);
+            messageParams.setMargins(dip8, dip8, dip8, dip16);
             messageView.setLayoutParams(messageParams);
-            mainLayout.addView(messageView);
+            contentContainer.addView(messageView);
         }
 
         // EditText (if provided).
@@ -847,10 +859,7 @@ public static Pair<Dialog, LinearLayout> createCustomDialog(
                     LinearLayout.LayoutParams.WRAP_CONTENT
             );
             editTextParams.setMargins(0, dip8, 0, dip16);
-            // Prevent buttons from moving off the screen by fixing the height of the EditText.
-            final int maxHeight = (int) (context.getResources().getDisplayMetrics().heightPixels * 0.6);
-            editText.setMaxHeight(maxHeight);
-            mainLayout.addView(editText, 1, editTextParams);
+            contentContainer.addView(editText, editTextParams);
         }
 
         // Button container.
@@ -1036,6 +1045,8 @@ public static Pair<Dialog, LinearLayout> createCustomDialog(
             }
         }
 
+        // Add content and buttons to main layout.
+        mainLayout.addView(contentScrollView);
         mainLayout.addView(buttonContainer);
         dialog.setContentView(mainLayout);
 

extensions/shared/library/src/main/java/app/revanced/extension/shared/checks/Check.java

@@ -129,8 +129,7 @@ static void issueWarning(Activity activity, Collection<Check> failedChecks) {
             ImageView iconView = new ImageView(activity);
             iconView.setImageResource(Utils.getResourceIdentifier("revanced_ic_dialog_alert", "drawable"));
             iconView.setColorFilter(Utils.getAppForegroundColor(), PorterDuff.Mode.SRC_IN);
-            final int dip8 = dipToPixels(8);
-            iconView.setPadding(0, dip8, 0, dip8);
+            iconView.setPadding(0, 0, 0, 0);
             LinearLayout.LayoutParams iconParams = new LinearLayout.LayoutParams(
                     LinearLayout.LayoutParams.WRAP_CONTENT,
                     LinearLayout.LayoutParams.WRAP_CONTENT

extensions/youtube/src/main/java/app/revanced/extension/youtube/settings/SearchViewController.java

@@ -19,6 +19,7 @@
 import android.widget.TextView;
 import android.widget.Toolbar;
 
+import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
@@ -72,10 +73,17 @@ private static GradientDrawable createBackgroundDrawable(Context context) {
     private static GradientDrawable createSuggestionBackgroundDrawable(Context context) {
         GradientDrawable background = new GradientDrawable();
         background.setShape(GradientDrawable.RECTANGLE);
-        background.setCornerRadius(8 * context.getResources().getDisplayMetrics().density); // 8dp corner radius.
+        background.setColor(getSearchViewBackground());
         return background;
     }
 
+    @ColorInt
+    public static int getSearchViewBackground() {
+        return Utils.isDarkModeEnabled()
+                ? Utils.adjustColorBrightness(Utils.getDialogBackgroundColor(), 1.11f)
+                : Utils.adjustColorBrightness(Utils.getThemeLightColor(), 0.95f);
+    }
+
     /**
      * Adds search view components to the activity.
      */

patches/src/main/resources/settings/drawable/revanced_ic_dialog_alert.xml

@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="48dp"
-        android:height="48dp"
-        android:viewportWidth="48"
-        android:viewportHeight="48">
+        android:width="40dp"
+        android:height="40dp"
+        android:viewportWidth="40"
+        android:viewportHeight="40">
     <path
             android:fillColor="#000000"
             android:fillType="evenOdd"
-            android:pathData="M26.5977,6.29688 L43.8672,36.2031 C45.0195,38.2031,43.5781,40.7031,41.2695,40.7031 L6.73047,40.7031 C4.42188,40.7031,2.98047,38.2031,4.13281,36.2031 L21.4023,6.29688 C22.5547,4.29688,25.4453,4.29688,26.5977,6.29688 Z M24,30 C22.8945,30,22,30.8945,22,32 C22,33.1055,22.8945,34,24,34 C25.1055,34,26,33.1055,26,32 C26,30.8945,25.1055,30,24,30 Z M24,16 C22.9727,16,22.1289,16.7734,22.0117,17.7656 L22,18 L22,26 C22,27.1055,22.8945,28,24,28 C25.0273,28,25.8711,27.2266,25.9883,26.2344 L26,26 L26,18 C26,16.8945,25.1055,16,24,16 Z M24,16" />
+            android:pathData="M22.1641,5.24609 L36.5547,30.168 C37.5156,31.8359,36.3164,33.918,34.3906,33.918 L5.60938,33.918 C3.68359,33.918,2.48438,31.8359,3.44531,30.168 L17.8359,5.24609 C18.7969,3.58203,21.2031,3.58203,22.1641,5.24609 Z M20,25 C19.0781,25,18.332,25.7461,18.332,26.668 C18.332,27.5898,19.0781,28.332,20,28.332 C20.9219,28.332,21.668,27.5898,21.668,26.668 C21.668,25.7461,20.9219,25,20,25 Z M20,13.332 C19.1445,13.332,18.4414,13.9766,18.3438,14.8047 L18.332,15 L18.332,21.668 C18.332,22.5898,19.0781,23.332,20,23.332 C20.8555,23.332,21.5586,22.6875,21.6563,21.8633 L21.668,21.668 L21.668,15 C21.668,14.0781,20.9219,13.332,20,13.332 Z M20,13.332" />
 </vector>