capacitor-extended-dialog 0.0.11 → 0.0.13

package/README.md

@@ -9,6 +9,13 @@ npm install capacitor-extended-dialog
 npx cap sync
 ```
 
+## Android sheet behavior
+
+- In `mode: 'basic'`, native Android sheets open between 50% and 80% of screen height.
+- Dragging up continuously increases available body space while keeping header content at the top and actions pinned to the bottom.
+- If sheet content exceeds the 80% initial cap, the body area becomes internally scrollable.
+- In `mode: 'fullscreen'`, the same top-content/bottom-actions layout is preserved with a scrollable body area for overflow.
+
 ## API
 
 <docgen-index>
@@ -241,6 +248,7 @@ Show a message sheet dialog with an optional header logo, title, and message.
 | ------------------------ | ------------------------------------------------- | -------------------------------------------------------- |
 | **`headerLogo`**         | <code>string</code>                               | Header logo - supports base64 data URL or HTTP/HTTPS URL |
 | **`title`**              | <code>string</code>                               | Sheet title                                              |
+| **`subtitle`**           | <code>string</code>                               | Optional subtitle displayed between title and rows       |
 | **`rows`**               | <code>{}</code>                                   | Description rows                                         |
 | **`confirmButtonTitle`** | <code>string</code>                               | Confirm button title                                     |
 | **`cancelButtonTitle`**  | <code>string</code>                               | Cancel button title                                      |
@@ -269,6 +277,7 @@ Show a message sheet dialog with an optional header logo, title, and message.
 | ------------------------ | ------------------------------------------------- | -------------------------------------------------------- |
 | **`headerLogo`**         | <code>string</code>                               | Header logo - supports base64 data URL or HTTP/HTTPS URL |
 | **`title`**              | <code>string</code>                               | Sheet title                                              |
+| **`subtitle`**           | <code>string</code>                               | Optional subtitle displayed between title and message    |
 | **`message`**            | <code>string</code>                               | Message body displayed in the sheet                      |
 | **`confirmButtonTitle`** | <code>string</code>                               | Confirm button title                                     |
 | **`cancelButtonTitle`**  | <code>string</code>                               | Cancel button title                                      |

package/android/src/main/java/com/albermonte/extendeddialog/DialogStyleOptions.java

@@ -171,7 +171,9 @@ public class DialogStyleOptions {
         options.messageFontSize = bundle.containsKey(KEY_MESSAGE_FONT_SIZE) ? bundle.getFloat(KEY_MESSAGE_FONT_SIZE) : null;
         options.buttonFontSize = bundle.containsKey(KEY_BUTTON_FONT_SIZE) ? bundle.getFloat(KEY_BUTTON_FONT_SIZE) : null;
         options.contentButtonSpacing = bundle.containsKey(KEY_CONTENT_BUTTON_SPACING) ? bundle.getFloat(KEY_CONTENT_BUTTON_SPACING) : null;
-        options.headerLogoCornerRadius = bundle.containsKey(KEY_HEADER_LOGO_CORNER_RADIUS) ? bundle.getFloat(KEY_HEADER_LOGO_CORNER_RADIUS) : null;
+        options.headerLogoCornerRadius = bundle.containsKey(KEY_HEADER_LOGO_CORNER_RADIUS)
+            ? bundle.getFloat(KEY_HEADER_LOGO_CORNER_RADIUS)
+            : null;
         return options;
     }
 }

package/android/src/main/java/com/albermonte/extendeddialog/ExtendedDialog.java

@@ -744,6 +744,7 @@ public class ExtendedDialog {
     public void showSheet(
         Activity activity,
         String title,
+        String subtitle,
         String headerLogo,
         JSONArray rows,
         String confirmButtonTitle,
@@ -760,6 +761,7 @@ public class ExtendedDialog {
         fragmentActivity.runOnUiThread(() -> {
             SheetBottomDialogFragment fragment = SheetBottomDialogFragment.newInstance(
                 title,
+                subtitle,
                 headerLogo,
                 rows.toString(),
                 confirmButtonTitle != null ? confirmButtonTitle : "Confirm",
@@ -775,6 +777,7 @@ public class ExtendedDialog {
     public void showMessageSheet(
         Activity activity,
         String title,
+        String subtitle,
         String message,
         String headerLogo,
         String confirmButtonTitle,
@@ -791,6 +794,7 @@ public class ExtendedDialog {
         fragmentActivity.runOnUiThread(() -> {
             SheetBottomDialogFragment fragment = SheetBottomDialogFragment.newMessageInstance(
                 title,
+                subtitle,
                 headerLogo,
                 message,
                 confirmButtonTitle != null ? confirmButtonTitle : "Confirm",

package/android/src/main/java/com/albermonte/extendeddialog/ExtendedDialogPlugin.java

@@ -211,6 +211,7 @@ public class ExtendedDialogPlugin extends Plugin {
     @PluginMethod
     public void sheet(PluginCall call) {
         String title = call.getString("title");
+        String subtitle = call.getString("subtitle");
         String headerLogo = call.getString("headerLogo");
         JSArray rowsArray = call.getArray("rows");
         String confirmButtonTitle = call.getString("confirmButtonTitle");
@@ -235,6 +236,7 @@ public class ExtendedDialogPlugin extends Plugin {
             implementation.showSheet(
                 getActivity(),
                 title,
+                subtitle,
                 headerLogo,
                 rows,
                 confirmButtonTitle,
@@ -255,6 +257,7 @@ public class ExtendedDialogPlugin extends Plugin {
     @PluginMethod
     public void messageSheet(PluginCall call) {
         String title = call.getString("title");
+        String subtitle = call.getString("subtitle");
         String message = call.getString("message");
         String headerLogo = call.getString("headerLogo");
         String confirmButtonTitle = call.getString("confirmButtonTitle");
@@ -276,6 +279,7 @@ public class ExtendedDialogPlugin extends Plugin {
         implementation.showMessageSheet(
             getActivity(),
             title,
+            subtitle,
             message,
             headerLogo,
             confirmButtonTitle,

package/android/src/main/java/com/albermonte/extendeddialog/SheetBottomDialogFragment.java

@@ -21,6 +21,9 @@ import android.widget.ScrollView;
 import android.widget.TextView;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
 import androidx.core.widget.TextViewCompat;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
@@ -46,18 +49,27 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
     private static final String ARG_CONFIRM_BUTTON = "confirmButton";
     private static final String ARG_CANCEL_BUTTON = "cancelButton";
     private static final String ARG_FULLSCREEN = "fullscreen";
+    private static final String ARG_SUBTITLE = "subtitle";
     private static final String ARG_IS_MESSAGE_SHEET = "isMessageSheet";
 
     private ExtendedDialog.SheetCallback sheetCallback;
     private boolean dismissed = false;
     private Context themedContext;
+    private LinearLayout rootLayout;
     private ScrollView scrollView;
     private LinearLayout headerLayout;
     private LinearLayout bodyLayout;
     private LinearLayout buttonContainer;
+    private int buttonHorizontalPaddingPx;
+    private int buttonTopPaddingPx;
+    private int buttonBottomBasePaddingPx;
+    private int buttonBottomInsetsPx;
+    private int buttonExpandedExtraPaddingPx;
+    private boolean applyExpandedButtonOffset;
 
     public static SheetBottomDialogFragment newInstance(
         String title,
+        String subtitle,
         String headerLogo,
         String rowsJson,
         String confirmButton,
@@ -68,6 +80,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
         SheetBottomDialogFragment fragment = new SheetBottomDialogFragment();
         Bundle args = new Bundle();
         args.putString(ARG_TITLE, title);
+        args.putString(ARG_SUBTITLE, subtitle);
         args.putString(ARG_HEADER_LOGO, headerLogo);
         args.putString(ARG_ROWS, rowsJson);
         args.putString(ARG_CONFIRM_BUTTON, confirmButton);
@@ -83,6 +96,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
 
     public static SheetBottomDialogFragment newMessageInstance(
         String title,
+        String subtitle,
         String headerLogo,
         String message,
         String confirmButton,
@@ -93,6 +107,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
         SheetBottomDialogFragment fragment = new SheetBottomDialogFragment();
         Bundle args = new Bundle();
         args.putString(ARG_TITLE, title);
+        args.putString(ARG_SUBTITLE, subtitle);
         args.putString(ARG_HEADER_LOGO, headerLogo);
         args.putString(ARG_MESSAGE, message);
         args.putString(ARG_CONFIRM_BUTTON, confirmButton);
@@ -134,6 +149,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
         }
 
         String title = args.getString(ARG_TITLE, "");
+        String subtitle = args.getString(ARG_SUBTITLE);
         String headerLogo = args.getString(ARG_HEADER_LOGO);
         String rowsJson = args.getString(ARG_ROWS);
         String message = args.getString(ARG_MESSAGE, "");
@@ -145,10 +161,13 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
 
         Context ctx = getThemedContext();
         float density = getResources().getDisplayMetrics().density;
+        int screenHeight = getResources().getDisplayMetrics().heightPixels;
+        int initialRootHeight = fullscreen ? screenHeight : (int) (screenHeight * 0.5f);
 
         // Root layout
-        LinearLayout root = new LinearLayout(ctx);
-        root.setOrientation(LinearLayout.VERTICAL);
+        rootLayout = new LinearLayout(ctx);
+        rootLayout.setOrientation(LinearLayout.VERTICAL);
+        rootLayout.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, initialRootHeight));
 
         // Apply background color
         if (styleOptions.getBackgroundColor() != null) {
@@ -161,7 +180,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
                 .build();
             MaterialShapeDrawable shapeDrawable = new MaterialShapeDrawable(shapeModel);
             shapeDrawable.setFillColor(ColorStateList.valueOf(styleOptions.getBackgroundColor()));
-            root.setBackground(shapeDrawable);
+            rootLayout.setBackground(shapeDrawable);
         }
 
         // Drag handle (only shown in basic/non-fullscreen mode)
@@ -180,7 +199,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
             handleDrawable.setCornerRadius(handleHeight / 2f);
             handleDrawable.setColor(outlineVariantColor);
             dragHandle.setBackground(handleDrawable);
-            root.addView(dragHandle);
+            rootLayout.addView(dragHandle);
         }
 
         int horizontalPadding = (int) (24 * density);
@@ -212,12 +231,14 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
             }
             if (radiusPx > 0) {
                 logoView.setClipToOutline(true);
-                logoView.setOutlineProvider(new android.view.ViewOutlineProvider() {
-                    @Override
-                    public void getOutline(android.view.View view, android.graphics.Outline outline) {
-                        outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), radiusPx);
+                logoView.setOutlineProvider(
+                    new android.view.ViewOutlineProvider() {
+                        @Override
+                        public void getOutline(android.view.View view, android.graphics.Outline outline) {
+                            outline.setRoundRect(0, 0, view.getWidth(), view.getHeight(), radiusPx);
+                        }
                     }
-                });
+                );
             }
 
             headerLayout.addView(logoView);
@@ -243,16 +264,40 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
                 LinearLayout.LayoutParams.MATCH_PARENT,
                 LinearLayout.LayoutParams.WRAP_CONTENT
             );
-            titleParams.bottomMargin = (int) (20 * density);
+            titleParams.bottomMargin = (subtitle != null && !subtitle.isEmpty()) ? (int) (4 * density) : (int) (20 * density);
             titleView.setLayoutParams(titleParams);
             headerLayout.addView(titleView);
         }
-        root.addView(headerLayout);
+
+        // Subtitle
+        if (subtitle != null && !subtitle.isEmpty()) {
+            TextView subtitleView = new TextView(ctx);
+            subtitleView.setText(subtitle);
+            TextViewCompat.setTextAppearance(subtitleView, com.google.android.material.R.style.TextAppearance_Material3_BodyMedium);
+            if (styleOptions.getMessageColor() != null) {
+                subtitleView.setTextColor(styleOptions.getMessageColor());
+            } else {
+                int secondaryColor = MaterialColors.getColor(ctx, android.R.attr.textColorSecondary, 0xFF49454F);
+                subtitleView.setTextColor(secondaryColor);
+            }
+            if (styleOptions.getMessageFontSize() != null) {
+                subtitleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, styleOptions.getMessageFontSize());
+            }
+            subtitleView.setGravity(Gravity.CENTER);
+            LinearLayout.LayoutParams subtitleParams = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.MATCH_PARENT,
+                LinearLayout.LayoutParams.WRAP_CONTENT
+            );
+            subtitleParams.bottomMargin = (int) (20 * density);
+            subtitleView.setLayoutParams(subtitleParams);
+            headerLayout.addView(subtitleView);
+        }
+        rootLayout.addView(headerLayout);
 
         // ScrollView for body content (rows/message only)
         scrollView = new ScrollView(ctx);
         scrollView.setFillViewport(true);
-        scrollView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+        scrollView.setLayoutParams(new LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f));
 
         bodyLayout = new LinearLayout(ctx);
         bodyLayout.setOrientation(LinearLayout.VERTICAL);
@@ -265,9 +310,7 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
             int messagePadding = (int) (16 * density);
             messageContainer.setPadding(messagePadding, messagePadding, messagePadding, messagePadding);
 
-            ShapeAppearanceModel messageShape = ShapeAppearanceModel.builder()
-                .setAllCornerSizes(12 * density)
-                .build();
+            ShapeAppearanceModel messageShape = ShapeAppearanceModel.builder().setAllCornerSizes(12 * density).build();
             MaterialShapeDrawable messageBackground = new MaterialShapeDrawable(messageShape);
             int surfaceVariant = MaterialColors.getColor(ctx, com.google.android.material.R.attr.colorSurfaceVariant, 0xFFE7E0EC);
             messageBackground.setFillColor(ColorStateList.valueOf(surfaceVariant));
@@ -312,14 +355,35 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
         }
 
         scrollView.addView(bodyLayout);
-        root.addView(scrollView);
+        rootLayout.addView(scrollView);
 
         // Button container pinned at bottom
         buttonContainer = new LinearLayout(ctx);
         buttonContainer.setOrientation(LinearLayout.VERTICAL);
         float topSpacing = styleOptions.getContentButtonSpacing() != null ? styleOptions.getContentButtonSpacing() : 12f;
-
-        buttonContainer.setPadding(horizontalPadding, (int) (topSpacing * density), horizontalPadding, (int) (4 * density));
+        int buttonTopPadding = (int) (topSpacing * density);
+        int baseBottomPadding = (int) ((fullscreen ? 4f : 12f) * density);
+        int nonFullscreenExtraBottomPadding = fullscreen ? 0 : (int) (4 * density);
+        int bottomPaddingWithoutInsets = baseBottomPadding + nonFullscreenExtraBottomPadding;
+
+        buttonHorizontalPaddingPx = horizontalPadding;
+        buttonTopPaddingPx = buttonTopPadding;
+        buttonBottomBasePaddingPx = bottomPaddingWithoutInsets;
+        buttonBottomInsetsPx = 0;
+        buttonExpandedExtraPaddingPx = (int) (48 * density);
+        applyExpandedButtonOffset = fullscreen;
+
+        applyButtonContainerPadding();
+
+        ViewCompat.setOnApplyWindowInsetsListener(buttonContainer, (viewWithInsets, windowInsets) -> {
+            Insets systemBarInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars());
+            Insets gestureInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemGestures());
+            Insets tappableInsets = windowInsets.getInsets(WindowInsetsCompat.Type.tappableElement());
+            buttonBottomInsetsPx = Math.max(systemBarInsets.bottom, Math.max(gestureInsets.bottom, tappableInsets.bottom));
+            applyButtonContainerPadding();
+            return windowInsets;
+        });
+        ViewCompat.requestApplyInsets(buttonContainer);
 
         int primaryColor = MaterialColors.getColor(ctx, android.R.attr.colorPrimary, 0xFF6750A4);
 
@@ -380,9 +444,9 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
         cancelBtn.setLayoutParams(cancelParams);
         buttonContainer.addView(cancelBtn);
 
-        root.addView(buttonContainer);
+        rootLayout.addView(buttonContainer);
 
-        return root;
+        return rootLayout;
     }
 
     @Override
@@ -413,22 +477,57 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
                 behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
                 // Prevent dragging down in fullscreen mode
                 behavior.setDraggable(false);
+                setExpandedButtonOffset(true);
+                behavior.addBottomSheetCallback(
+                    new BottomSheetBehavior.BottomSheetCallback() {
+                        @Override
+                        public void onStateChanged(@NonNull View sheet, int newState) {
+                            if (newState == BottomSheetBehavior.STATE_EXPANDED) {
+                                setExpandedButtonOffset(true);
+                                setRootHeight(getVisibleSheetHeight(sheet));
+                            }
+                        }
+
+                        @Override
+                        public void onSlide(@NonNull View sheet, float slideOffset) {
+                            setExpandedButtonOffset(true);
+                            setRootHeight(getVisibleSheetHeight(sheet));
+                        }
+                    }
+                );
+                bottomSheet.post(() -> setRootHeight(getVisibleSheetHeight(bottomSheet)));
             } else {
-                // Dynamic height based on content (min 50%, max 80%), drag down to close
+                // Multi-stop bottom sheet: drag up to fullscreen, drag down to dismiss
                 ViewGroup.LayoutParams layoutParams = bottomSheet.getLayoutParams();
                 layoutParams.height = ViewGroup.LayoutParams.MATCH_PARENT;
                 bottomSheet.setLayoutParams(layoutParams);
 
-                behavior.setFitToContents(true);
+                behavior.setFitToContents(false);
                 behavior.setSkipCollapsed(true);
                 behavior.setHideable(true);
                 behavior.setDraggable(true);
 
+                behavior.addBottomSheetCallback(
+                    new BottomSheetBehavior.BottomSheetCallback() {
+                        @Override
+                        public void onStateChanged(@NonNull View sheet, int newState) {
+                            if (newState == BottomSheetBehavior.STATE_HALF_EXPANDED || newState == BottomSheetBehavior.STATE_EXPANDED) {
+                                setExpandedButtonOffset(newState == BottomSheetBehavior.STATE_EXPANDED);
+                                setRootHeight(getVisibleSheetHeight(sheet));
+                            }
+                        }
+
+                        @Override
+                        public void onSlide(@NonNull View sheet, float slideOffset) {
+                            setExpandedButtonOffset(slideOffset >= 0.9f);
+                            setRootHeight(getVisibleSheetHeight(sheet));
+                        }
+                    }
+                );
+
                 bottomSheet.post(() -> {
                     int screenHeight = getResources().getDisplayMetrics().heightPixels;
-                    int width = bottomSheet.getWidth() > 0
-                        ? bottomSheet.getWidth()
-                        : getResources().getDisplayMetrics().widthPixels;
+                    int width = bottomSheet.getWidth() > 0 ? bottomSheet.getWidth() : getResources().getDisplayMetrics().widthPixels;
 
                     int widthSpec = View.MeasureSpec.makeMeasureSpec(width, View.MeasureSpec.EXACTLY);
                     int heightSpec = View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED);
@@ -445,36 +544,85 @@ public class SheetBottomDialogFragment extends BottomSheetDialogFragment {
                         bodyHeight = bodyLayout.getMeasuredHeight();
                     }
 
-                    int buttonHeight = 0;
+                    int btnHeight = 0;
                     if (buttonContainer != null) {
                         buttonContainer.measure(widthSpec, heightSpec);
-                        buttonHeight = buttonContainer.getMeasuredHeight();
+                        btnHeight = buttonContainer.getMeasuredHeight();
                     }
 
-                    int minHeight = (int) (screenHeight * 0.5f);
-                    int maxHeight = (int) (screenHeight * 0.8f);
-                    int desiredHeight = headerHeight + bodyHeight + buttonHeight;
-                    desiredHeight = Math.max(desiredHeight, minHeight);
-                    desiredHeight = Math.min(desiredHeight, maxHeight);
-
-                    if (scrollView != null) {
-                        ViewGroup.LayoutParams scrollParams = scrollView.getLayoutParams();
-                        int scrollHeight = Math.max(0, desiredHeight - headerHeight - buttonHeight);
-                        scrollParams.height = scrollHeight;
-                        scrollView.setLayoutParams(scrollParams);
-                    }
+                    // Add drag handle height (~28dp)
+                    float density = getResources().getDisplayMetrics().density;
+                    int dragHandleHeight = (int) (28 * density);
 
-                    ViewGroup.LayoutParams sheetParams = bottomSheet.getLayoutParams();
-                    sheetParams.height = desiredHeight;
-                    bottomSheet.setLayoutParams(sheetParams);
+                    int contentRequiredHeight = headerHeight + bodyHeight + btnHeight + dragHandleHeight;
+                    int desiredHeight = clampInitialSheetHeight(screenHeight, contentRequiredHeight);
+                    float ratio = calculateHalfExpandedRatio(screenHeight, desiredHeight);
 
+                    setRootHeight(desiredHeight);
+                    behavior.setHalfExpandedRatio(ratio);
                     behavior.setPeekHeight(desiredHeight);
-                    behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
+                    behavior.setState(BottomSheetBehavior.STATE_HALF_EXPANDED);
+                    bottomSheet.post(() -> setRootHeight(getVisibleSheetHeight(bottomSheet)));
                 });
             }
         });
     }
 
+    static int clampInitialSheetHeight(int screenHeight, int contentRequiredHeight) {
+        int minHeight = (int) (screenHeight * 0.5f);
+        int maxHeight = (int) (screenHeight * 0.8f);
+        int clampedToMin = Math.max(contentRequiredHeight, minHeight);
+        return Math.min(clampedToMin, maxHeight);
+    }
+
+    static float calculateHalfExpandedRatio(int screenHeight, int desiredHeight) {
+        if (screenHeight <= 0) {
+            return 0.5f;
+        }
+        float ratio = (float) desiredHeight / screenHeight;
+        return Math.max(0.5f, Math.min(ratio, 0.8f));
+    }
+
+    private int getVisibleSheetHeight(@NonNull View sheet) {
+        View parent = sheet.getParent() instanceof View ? (View) sheet.getParent() : null;
+        int parentHeight = parent != null ? parent.getHeight() : getResources().getDisplayMetrics().heightPixels;
+        int visibleHeight = parentHeight - sheet.getTop();
+        int nonNegativeHeight = Math.max(0, visibleHeight);
+        // Clamp to parent bounds to avoid overshoot during spring/drag transitions.
+        return Math.min(parentHeight, nonNegativeHeight);
+    }
+
+    private void setRootHeight(int targetHeight) {
+        if (rootLayout == null || targetHeight <= 0) {
+            return;
+        }
+        ViewGroup.LayoutParams params = rootLayout.getLayoutParams();
+        if (params == null) {
+            params = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, targetHeight);
+        } else if (params.height == targetHeight) {
+            return;
+        }
+        params.height = targetHeight;
+        rootLayout.setLayoutParams(params);
+    }
+
+    private void setExpandedButtonOffset(boolean enabled) {
+        if (applyExpandedButtonOffset == enabled) {
+            return;
+        }
+        applyExpandedButtonOffset = enabled;
+        applyButtonContainerPadding();
+    }
+
+    private void applyButtonContainerPadding() {
+        if (buttonContainer == null) {
+            return;
+        }
+        int expandedExtraBottomPadding = applyExpandedButtonOffset ? buttonExpandedExtraPaddingPx : 0;
+        int resolvedBottomPadding = buttonBottomBasePaddingPx + buttonBottomInsetsPx + expandedExtraBottomPadding;
+        buttonContainer.setPadding(buttonHorizontalPaddingPx, buttonTopPaddingPx, buttonHorizontalPaddingPx, resolvedBottomPadding);
+    }
+
     private LinearLayout createSheetRow(
         Context context,
         JSONObject row,

package/dist/docs.json

@@ -540,6 +540,13 @@
           "complexTypes": [],
           "type": "string"
         },
+        {
+          "name": "subtitle",
+          "tags": [],
+          "docs": "Optional subtitle displayed between title and rows",
+          "complexTypes": [],
+          "type": "string | undefined"
+        },
         {
           "name": "rows",
           "tags": [],
@@ -641,6 +648,13 @@
           "complexTypes": [],
           "type": "string"
         },
+        {
+          "name": "subtitle",
+          "tags": [],
+          "docs": "Optional subtitle displayed between title and message",
+          "complexTypes": [],
+          "type": "string | undefined"
+        },
         {
           "name": "message",
           "tags": [],

package/dist/esm/definitions.d.ts

@@ -270,6 +270,8 @@ export interface SheetOptions extends DialogStyleOptions {
     headerLogo?: string;
     /** Sheet title */
     title: string;
+    /** Optional subtitle displayed between title and rows */
+    subtitle?: string;
     /** Description rows */
     rows: SheetRow[];
     /** Confirm button title */
@@ -284,6 +286,8 @@ export interface MessageSheetOptions extends DialogStyleOptions {
     headerLogo?: string;
     /** Sheet title */
     title: string;
+    /** Optional subtitle displayed between title and message */
+    subtitle?: string;
     /** Message body displayed in the sheet */
     message: string;
     /** Confirm button title */

package/dist/esm/definitions.js.map

@@ -1 +1 @@
-{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * Dialog presentation mode.\n *\n * - `'basic'` — Standard modal dialog (default)\n * - `'fullscreen'` — Full-screen dialog presentation\n */\nexport type DialogMode = 'basic' | 'fullscreen';\n\nexport interface DialogStyleOptions {\n  /**\n   * Color for the OK/primary button (hex format, e.g., \"#FF5722\")\n   */\n  buttonColor?: string;\n  /**\n   * Color for the cancel button (hex format, e.g., \"#757575\")\n   */\n  cancelButtonColor?: string;\n  /**\n   * Color for the title text (hex format, e.g., \"#000000\")\n   */\n  titleColor?: string;\n  /**\n   * Color for the message text (hex format, e.g., \"#666666\")\n   */\n  messageColor?: string;\n  /**\n   * Background color of the dialog (hex format, e.g., \"#FFFFFF\")\n   */\n  backgroundColor?: string;\n  /**\n   * Font size for the title text in sp/pt (e.g., 20)\n   */\n  titleFontSize?: number;\n  /**\n   * Font size for the message text in sp/pt (e.g., 16)\n   */\n  messageFontSize?: number;\n  /**\n   * Font size for the button text in sp/pt (e.g., 14)\n   */\n  buttonFontSize?: number;\n  /**\n   * Vertical spacing between dialog content and the confirm/cancel buttons in dp/pt/px (e.g., 16).\n   * Only applies to fullscreen and sheet modes.\n   *\n   * @example\n   * // Fullscreen confirm with extra spacing between content and buttons\n   * await ExtendedDialog.confirm({\n   *   title: 'Delete Account',\n   *   message: 'This action cannot be undone.',\n   *   mode: 'fullscreen',\n   *   contentButtonSpacing: 32,\n   * });\n   *\n   * @example\n   * // Sheet with tight spacing\n   * await ExtendedDialog.sheet({\n   *   title: 'Order Summary',\n   *   rows: [{ title: 'Total', value: '$9.99' }],\n   *   contentButtonSpacing: 8,\n   * });\n   */\n  contentButtonSpacing?: number;\n  /**\n   * Corner radius for the header logo in sheet dialogs (in dp/pt/px).\n   * - Positive number: specific radius (e.g., 12)\n   * - 0: square corners (no rounding)\n   * - -1: full circle (radius = half of logo size)\n   *\n   * @default 8\n   *\n   * @example\n   * // Custom rounded corners (12px)\n   * await ExtendedDialog.sheet({\n   *   title: 'Settings',\n   *   headerLogo: 'https://example.com/logo.png',\n   *   headerLogoCornerRadius: 12,\n   *   rows: [],\n   * });\n   *\n   * @example\n   * // Full circle logo\n   * await ExtendedDialog.sheet({\n   *   title: 'Profile',\n   *   headerLogo: 'https://example.com/avatar.png',\n   *   headerLogoCornerRadius: -1,\n   *   rows: [],\n   * });\n   *\n   * @example\n   * // Square logo (no rounding)\n   * await ExtendedDialog.sheet({\n   *   title: 'Document',\n   *   headerLogo: 'https://example.com/icon.png',\n   *   headerLogoCornerRadius: 0,\n   *   rows: [],\n   * });\n   */\n  headerLogoCornerRadius?: number;\n}\n\nexport interface BaseDialogOptions extends DialogStyleOptions {\n  /**\n   * Title displayed at the top of the dialog.\n   */\n  title?: string;\n  /**\n   * Message body displayed in the dialog.\n   */\n  message: string;\n  /**\n   * Presentation mode for the dialog.\n   *\n   * @default 'basic'\n   */\n  mode?: DialogMode;\n}\n\nexport interface AlertOptions extends BaseDialogOptions {\n  /**\n   * Title for the dismiss button.\n   *\n   * @default \"OK\"\n   */\n  buttonTitle?: string;\n}\n\nexport interface ConfirmOptions extends BaseDialogOptions {\n  /**\n   * Title for the confirmation button.\n   *\n   * @default \"OK\"\n   */\n  okButtonTitle?: string;\n  /**\n   * Title for the cancel button.\n   *\n   * @default \"Cancel\"\n   */\n  cancelButtonTitle?: string;\n}\n\nexport interface PromptOptions extends BaseDialogOptions {\n  /**\n   * Title for the confirmation button.\n   *\n   * @default \"OK\"\n   */\n  okButtonTitle?: string;\n  /**\n   * Title for the cancel button.\n   *\n   * @default \"Cancel\"\n   */\n  cancelButtonTitle?: string;\n  /**\n   * Placeholder text shown in the input field when empty.\n   */\n  inputPlaceholder?: string;\n  /**\n   * Pre-filled value for the input field.\n   */\n  inputText?: string;\n  /**\n   * Whether to automatically focus the input field and open the keyboard when the dialog appears.\n   *\n   * Note: On iOS, basic (non-fullscreen) dialogs always auto-focus the input field due to\n   * UIAlertController's built-in behavior. This option only takes effect on iOS when using\n   * fullscreen mode (`mode: 'fullscreen'`). On Android and web, this works for all modes.\n   *\n   * @default false\n   */\n  focusInput?: boolean;\n}\n\nexport interface SelectOption {\n  /**\n   * Display text for the option.\n   */\n  label: string;\n  /**\n   * Value returned when the option is selected.\n   */\n  value: string;\n}\n\nexport interface SingleSelectOptions extends BaseDialogOptions {\n  /**\n   * List of options to display for selection.\n   */\n  options: SelectOption[];\n  /**\n   * Value of the initially selected option.\n   */\n  selectedValue?: string;\n  /**\n   * Title for the confirmation button.\n   *\n   * @default \"OK\"\n   */\n  okButtonTitle?: string;\n  /**\n   * Title for the cancel button.\n   *\n   * @default \"Cancel\"\n   */\n  cancelButtonTitle?: string;\n}\n\nexport interface MultiSelectOptions extends BaseDialogOptions {\n  /**\n   * List of options to display for selection.\n   */\n  options: SelectOption[];\n  /**\n   * Values of the initially selected options.\n   */\n  selectedValues?: string[];\n  /**\n   * Title for the confirmation button.\n   *\n   * @default \"OK\"\n   */\n  okButtonTitle?: string;\n  /**\n   * Title for the cancel button.\n   *\n   * @default \"Cancel\"\n   */\n  cancelButtonTitle?: string;\n}\n\nexport interface ConfirmResult {\n  /**\n   * Whether the user confirmed (`true`) or cancelled (`false`).\n   */\n  value: boolean;\n}\n\nexport interface PromptResult {\n  /**\n   * The text entered by the user. Empty string if cancelled.\n   */\n  value: string;\n  /**\n   * Whether the user cancelled the dialog.\n   */\n  cancelled: boolean;\n}\n\nexport interface SingleSelectResult {\n  /**\n   * The value of the selected option, or `null` if cancelled.\n   */\n  value: string | null;\n  /**\n   * Whether the user cancelled the dialog.\n   */\n  cancelled: boolean;\n}\n\nexport interface MultiSelectResult {\n  /**\n   * The values of the selected options. Empty array if cancelled.\n   */\n  values: string[];\n  /**\n   * Whether the user cancelled the dialog.\n   */\n  cancelled: boolean;\n}\n\nexport interface SheetRow {\n  /** Row title (required) */\n  title: string;\n  /** Optional logo/icon - supports base64 data URL or HTTP/HTTPS URL */\n  logo?: string;\n  /** Optional value displayed on the right */\n  value?: string;\n}\n\nexport interface SheetOptions extends DialogStyleOptions {\n  /** Header logo - supports base64 data URL or HTTP/HTTPS URL */\n  headerLogo?: string;\n  /** Sheet title */\n  title: string;\n  /** Description rows */\n  rows: SheetRow[];\n  /** Confirm button title */\n  confirmButtonTitle?: string; // default: \"Confirm\"\n  /** Cancel button title */\n  cancelButtonTitle?: string; // default: \"Cancel\"\n  /** Dialog mode */\n  mode?: DialogMode;\n}\n\nexport interface MessageSheetOptions extends DialogStyleOptions {\n  /** Header logo - supports base64 data URL or HTTP/HTTPS URL */\n  headerLogo?: string;\n  /** Sheet title */\n  title: string;\n  /** Message body displayed in the sheet */\n  message: string;\n  /** Confirm button title */\n  confirmButtonTitle?: string; // default: \"Confirm\"\n  /** Cancel button title */\n  cancelButtonTitle?: string; // default: \"Cancel\"\n  /** Dialog mode */\n  mode?: DialogMode;\n}\n\nexport interface SheetResult {\n  /** True if confirmed, false if cancelled */\n  confirmed: boolean;\n}\n\nexport interface MessageSheetResult {\n  /** True if confirmed, false if cancelled */\n  confirmed: boolean;\n}\n\nexport interface ExtendedDialogPlugin {\n  /**\n   * Show an alert dialog with a single dismiss button.\n   *\n   * @param options - Alert configuration options.\n   */\n  alert(options: AlertOptions): Promise<void>;\n  /**\n   * Show a confirmation dialog with OK and Cancel buttons.\n   *\n   * @param options - Confirm configuration options.\n   * @returns The user's confirmation choice.\n   */\n  confirm(options: ConfirmOptions): Promise<ConfirmResult>;\n  /**\n   * Show a prompt dialog with a text input field.\n   *\n   * @param options - Prompt configuration options.\n   * @returns The entered text and whether the dialog was cancelled.\n   */\n  prompt(options: PromptOptions): Promise<PromptResult>;\n  /**\n   * Show a single-select dialog where the user picks one option.\n   *\n   * @param options - Single select configuration options.\n   * @returns The selected value and whether the dialog was cancelled.\n   */\n  singleSelect(options: SingleSelectOptions): Promise<SingleSelectResult>;\n  /**\n   * Show a multi-select dialog where the user picks one or more options.\n   *\n   * @param options - Multi select configuration options.\n   * @returns The selected values and whether the dialog was cancelled.\n   */\n  multiSelect(options: MultiSelectOptions): Promise<MultiSelectResult>;\n  /**\n   * Show a sheet dialog with a header, title, and structured data rows.\n   *\n   * @param options - Sheet configuration options.\n   * @returns Whether the user confirmed or cancelled the sheet.\n   */\n  sheet(options: SheetOptions): Promise<SheetResult>;\n\n  /**\n   * Show a message sheet dialog with an optional header logo, title, and message.\n   *\n   * @param options - Message sheet configuration options.\n   * @returns Whether the user confirmed or cancelled the sheet.\n   */\n  messageSheet(options: MessageSheetOptions): Promise<MessageSheetResult>;\n}\n"]}
+{"version":3,"file":"definitions.js","sourceRoot":"","sources":["../../src/definitions.ts"],"names":[],"mappings":"","sourcesContent":["/**\n * Dialog presentation mode.\n *\n * - `'basic'` — Standard modal dialog (default)\n * - `'fullscreen'` — Full-screen dialog presentation\n */\nexport type DialogMode = 'basic' | 'fullscreen';\n\nexport interface DialogStyleOptions {\n  /**\n   * Color for the OK/primary button (hex format, e.g., \"#FF5722\")\n   */\n  buttonColor?: string;\n  /**\n   * Color for the cancel button (hex format, e.g., \"#757575\")\n   */\n  cancelButtonColor?: string;\n  /**\n   * Color for the title text (hex format, e.g., \"#000000\")\n   */\n  titleColor?: string;\n  /**\n   * Color for the message text (hex format, e.g., \"#666666\")\n   */\n  messageColor?: string;\n  /**\n   * Background color of the dialog (hex format, e.g., \"#FFFFFF\")\n   */\n  backgroundColor?: string;\n  /**\n   * Font size for the title text in sp/pt (e.g., 20)\n   */\n  titleFontSize?: number;\n  /**\n   * Font size for the message text in sp/pt (e.g., 16)\n   */\n  messageFontSize?: number;\n  /**\n   * Font size for the button text in sp/pt (e.g., 14)\n   */\n  buttonFontSize?: number;\n  /**\n   * Vertical spacing between dialog content and the confirm/cancel buttons in dp/pt/px (e.g., 16).\n   * Only applies to fullscreen and sheet modes.\n   *\n   * @example\n   * // Fullscreen confirm with extra spacing between content and buttons\n   * await ExtendedDialog.confirm({\n   *   title: 'Delete Account',\n   *   message: 'This action cannot be undone.',\n   *   mode: 'fullscreen',\n   *   contentButtonSpacing: 32,\n   * });\n   *\n   * @example\n   * // Sheet with tight spacing\n   * await ExtendedDialog.sheet({\n   *   title: 'Order Summary',\n   *   rows: [{ title: 'Total', value: '$9.99' }],\n   *   contentButtonSpacing: 8,\n   * });\n   */\n  contentButtonSpacing?: number;\n  /**\n   * Corner radius for the header logo in sheet dialogs (in dp/pt/px).\n   * - Positive number: specific radius (e.g., 12)\n   * - 0: square corners (no rounding)\n   * - -1: full circle (radius = half of logo size)\n   *\n   * @default 8\n   *\n   * @example\n   * // Custom rounded corners (12px)\n   * await ExtendedDialog.sheet({\n   *   title: 'Settings',\n   *   headerLogo: 'https://example.com/logo.png',\n   *   headerLogoCornerRadius: 12,\n   *   rows: [],\n   * });\n   *\n   * @example\n   * // Full circle logo\n   * await ExtendedDialog.sheet({\n   *   title: 'Profile',\n   *   headerLogo: 'https://example.com/avatar.png',\n   *   headerLogoCornerRadius: -1,\n   *   rows: [],\n   * });\n   *\n   * @example\n   * // Square logo (no rounding)\n   * await ExtendedDialog.sheet({\n   *   title: 'Document',\n   *   headerLogo: 'https://example.com/icon.png',\n   *   headerLogoCornerRadius: 0,\n   *   rows: [],\n   * });\n   */\n  headerLogoCornerRadius?: number;\n}\n\nexport interface BaseDialogOptions extends DialogStyleOptions {\n  /**\n   * Title displayed at the top of the dialog.\n   */\n  title?: string;\n  /**\n   * Message body displayed in the dialog.\n   */\n  message: string;\n  /**\n   * Presentation mode for the dialog.\n   *\n   * @default 'basic'\n   */\n  mode?: DialogMode;\n}\n\nexport interface AlertOptions extends BaseDialogOptions {\n  /**\n   * Title for the dismiss button.\n   *\n   * @default \"OK\"\n   */\n  buttonTitle?: string;\n}\n\nexport interface ConfirmOptions extends BaseDialogOptions {\n  /**\n   * Title for the confirmation button.\n   *\n   * @default \"OK\"\n   */\n  okButtonTitle?: string;\n  /**\n   * Title for the cancel button.\n   *\n   * @default \"Cancel\"\n   */\n  cancelButtonTitle?: string;\n}\n\nexport interface PromptOptions extends BaseDialogOptions {\n  /**\n   * Title for the confirmation button.\n   *\n   * @default \"OK\"\n   */\n  okButtonTitle?: string;\n  /**\n   * Title for the cancel button.\n   *\n   * @default \"Cancel\"\n   */\n  cancelButtonTitle?: string;\n  /**\n   * Placeholder text shown in the input field when empty.\n   */\n  inputPlaceholder?: string;\n  /**\n   * Pre-filled value for the input field.\n   */\n  inputText?: string;\n  /**\n   * Whether to automatically focus the input field and open the keyboard when the dialog appears.\n   *\n   * Note: On iOS, basic (non-fullscreen) dialogs always auto-focus the input field due to\n   * UIAlertController's built-in behavior. This option only takes effect on iOS when using\n   * fullscreen mode (`mode: 'fullscreen'`). On Android and web, this works for all modes.\n   *\n   * @default false\n   */\n  focusInput?: boolean;\n}\n\nexport interface SelectOption {\n  /**\n   * Display text for the option.\n   */\n  label: string;\n  /**\n   * Value returned when the option is selected.\n   */\n  value: string;\n}\n\nexport interface SingleSelectOptions extends BaseDialogOptions {\n  /**\n   * List of options to display for selection.\n   */\n  options: SelectOption[];\n  /**\n   * Value of the initially selected option.\n   */\n  selectedValue?: string;\n  /**\n   * Title for the confirmation button.\n   *\n   * @default \"OK\"\n   */\n  okButtonTitle?: string;\n  /**\n   * Title for the cancel button.\n   *\n   * @default \"Cancel\"\n   */\n  cancelButtonTitle?: string;\n}\n\nexport interface MultiSelectOptions extends BaseDialogOptions {\n  /**\n   * List of options to display for selection.\n   */\n  options: SelectOption[];\n  /**\n   * Values of the initially selected options.\n   */\n  selectedValues?: string[];\n  /**\n   * Title for the confirmation button.\n   *\n   * @default \"OK\"\n   */\n  okButtonTitle?: string;\n  /**\n   * Title for the cancel button.\n   *\n   * @default \"Cancel\"\n   */\n  cancelButtonTitle?: string;\n}\n\nexport interface ConfirmResult {\n  /**\n   * Whether the user confirmed (`true`) or cancelled (`false`).\n   */\n  value: boolean;\n}\n\nexport interface PromptResult {\n  /**\n   * The text entered by the user. Empty string if cancelled.\n   */\n  value: string;\n  /**\n   * Whether the user cancelled the dialog.\n   */\n  cancelled: boolean;\n}\n\nexport interface SingleSelectResult {\n  /**\n   * The value of the selected option, or `null` if cancelled.\n   */\n  value: string | null;\n  /**\n   * Whether the user cancelled the dialog.\n   */\n  cancelled: boolean;\n}\n\nexport interface MultiSelectResult {\n  /**\n   * The values of the selected options. Empty array if cancelled.\n   */\n  values: string[];\n  /**\n   * Whether the user cancelled the dialog.\n   */\n  cancelled: boolean;\n}\n\nexport interface SheetRow {\n  /** Row title (required) */\n  title: string;\n  /** Optional logo/icon - supports base64 data URL or HTTP/HTTPS URL */\n  logo?: string;\n  /** Optional value displayed on the right */\n  value?: string;\n}\n\nexport interface SheetOptions extends DialogStyleOptions {\n  /** Header logo - supports base64 data URL or HTTP/HTTPS URL */\n  headerLogo?: string;\n  /** Sheet title */\n  title: string;\n  /** Optional subtitle displayed between title and rows */\n  subtitle?: string;\n  /** Description rows */\n  rows: SheetRow[];\n  /** Confirm button title */\n  confirmButtonTitle?: string; // default: \"Confirm\"\n  /** Cancel button title */\n  cancelButtonTitle?: string; // default: \"Cancel\"\n  /** Dialog mode */\n  mode?: DialogMode;\n}\n\nexport interface MessageSheetOptions extends DialogStyleOptions {\n  /** Header logo - supports base64 data URL or HTTP/HTTPS URL */\n  headerLogo?: string;\n  /** Sheet title */\n  title: string;\n  /** Optional subtitle displayed between title and message */\n  subtitle?: string;\n  /** Message body displayed in the sheet */\n  message: string;\n  /** Confirm button title */\n  confirmButtonTitle?: string; // default: \"Confirm\"\n  /** Cancel button title */\n  cancelButtonTitle?: string; // default: \"Cancel\"\n  /** Dialog mode */\n  mode?: DialogMode;\n}\n\nexport interface SheetResult {\n  /** True if confirmed, false if cancelled */\n  confirmed: boolean;\n}\n\nexport interface MessageSheetResult {\n  /** True if confirmed, false if cancelled */\n  confirmed: boolean;\n}\n\nexport interface ExtendedDialogPlugin {\n  /**\n   * Show an alert dialog with a single dismiss button.\n   *\n   * @param options - Alert configuration options.\n   */\n  alert(options: AlertOptions): Promise<void>;\n  /**\n   * Show a confirmation dialog with OK and Cancel buttons.\n   *\n   * @param options - Confirm configuration options.\n   * @returns The user's confirmation choice.\n   */\n  confirm(options: ConfirmOptions): Promise<ConfirmResult>;\n  /**\n   * Show a prompt dialog with a text input field.\n   *\n   * @param options - Prompt configuration options.\n   * @returns The entered text and whether the dialog was cancelled.\n   */\n  prompt(options: PromptOptions): Promise<PromptResult>;\n  /**\n   * Show a single-select dialog where the user picks one option.\n   *\n   * @param options - Single select configuration options.\n   * @returns The selected value and whether the dialog was cancelled.\n   */\n  singleSelect(options: SingleSelectOptions): Promise<SingleSelectResult>;\n  /**\n   * Show a multi-select dialog where the user picks one or more options.\n   *\n   * @param options - Multi select configuration options.\n   * @returns The selected values and whether the dialog was cancelled.\n   */\n  multiSelect(options: MultiSelectOptions): Promise<MultiSelectResult>;\n  /**\n   * Show a sheet dialog with a header, title, and structured data rows.\n   *\n   * @param options - Sheet configuration options.\n   * @returns Whether the user confirmed or cancelled the sheet.\n   */\n  sheet(options: SheetOptions): Promise<SheetResult>;\n\n  /**\n   * Show a message sheet dialog with an optional header logo, title, and message.\n   *\n   * @param options - Message sheet configuration options.\n   * @returns Whether the user confirmed or cancelled the sheet.\n   */\n  messageSheet(options: MessageSheetOptions): Promise<MessageSheetResult>;\n}\n"]}