1
0
Эх сурвалжийг харах

Merge pull request #396 from teslacoil/master

Fixes related to the padding change
Aidan Follestad 10 жил өмнө
parent
commit
279f789dd6

+ 2 - 0
library/src/main/java/com/afollestad/materialdialogs/internal/MDButton.java

@@ -65,6 +65,8 @@ public class MDButton extends TextView {
             if (stacked) {
                 setPadding(mStackedEndPadding, getPaddingTop(), mStackedEndPadding, getPaddingBottom());
             } /* Else the padding was properly reset by the drawable */
+
+            mStacked = stacked;
         }
     }
 

+ 1 - 2
library/src/main/java/com/afollestad/materialdialogs/internal/MDRootLayout.java

@@ -9,7 +9,6 @@ import android.os.Build;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.RecyclerView;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.view.ViewGroup;
 import android.webkit.WebView;
@@ -130,7 +129,6 @@ public class MDRootLayout extends ViewGroup {
                     hasButtons = true;
                 }
             }
-            Log.v(TAG, "buttonWidth " + buttonsWidth + " " + mButtonBarHeight);
 
             int buttonBarPadding = getContext().getResources()
                     .getDimensionPixelSize(R.dimen.md_neutral_button_margin);
@@ -148,6 +146,7 @@ public class MDRootLayout extends ViewGroup {
                     button.setStacked(true, false);
                     measureChild(button, widthMeasureSpec, heightMeasureSpec);
                     stackedHeight += button.getMeasuredHeight();
+                    hasButtons = true;
                 }
             }
         }

+ 1 - 1
library/src/main/res/values/dimens.xml

@@ -39,7 +39,7 @@
 
     <dimen name="md_content_padding_top">8dp</dimen>
 
-    <dimen name="md_button_min_width">42dp</dimen>
+    <dimen name="md_button_min_width">64dp</dimen>
     <!-- Above and below buttons, 36+6+6=48 for the height of the button frame -->
     <dimen name="md_button_inset_vertical">6dp</dimen>
     <dimen name="md_button_inset_horizontal">4dp</dimen>