|
@@ -79,7 +79,7 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
|
|
|
protected Drawable titleIcon;
|
|
|
protected DialogXAnimInterface<BottomDialog> dialogXAnimImpl;
|
|
|
protected BUTTON_SELECT_RESULT buttonSelectResult = BUTTON_SELECT_RESULT.NONE;
|
|
|
- protected boolean onlyRestrictingSlideTouchEventsToScrollLayoutAreas = false;
|
|
|
+ protected boolean scrollableWhenContentLargeThanVisibleRange = true;
|
|
|
|
|
|
protected TextInfo titleTextInfo;
|
|
|
protected TextInfo messageTextInfo;
|
|
@@ -284,6 +284,12 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
|
|
|
boxList = convertView.findViewById(R.id.box_list);
|
|
|
boxCustom = convertView.findViewById(R.id.box_custom);
|
|
|
|
|
|
+ if (!scrollableWhenContentLargeThanVisibleRange) {
|
|
|
+ ViewGroup bodyContent = (ViewGroup) txtDialogTitle.getParent();
|
|
|
+ ((ViewGroup) boxContent.getParent()).removeView(boxContent);
|
|
|
+ bodyContent.addView(boxContent, new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT));
|
|
|
+ }
|
|
|
+
|
|
|
boxCancel = convertView.findViewWithTag("cancelBox");
|
|
|
|
|
|
boxButton = convertView.findViewById(R.id.box_button);
|
|
@@ -765,6 +771,10 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
|
|
|
}
|
|
|
return enterAnimDurationTemp;
|
|
|
}
|
|
|
+
|
|
|
+ public BottomDialogTouchEventInterceptor getBottomDialogTouchEventInterceptor() {
|
|
|
+ return bottomDialogTouchEventInterceptor;
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
public void refreshUI() {
|
|
@@ -1322,12 +1332,12 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
|
|
|
return this;
|
|
|
}
|
|
|
|
|
|
- public boolean isOnlyRestrictingSlideTouchEventsToScrollLayoutAreas() {
|
|
|
- return onlyRestrictingSlideTouchEventsToScrollLayoutAreas;
|
|
|
+ public boolean isScrollableWhenContentLargeThanVisibleRange() {
|
|
|
+ return scrollableWhenContentLargeThanVisibleRange;
|
|
|
}
|
|
|
|
|
|
- public BottomDialog setOnlyRestrictingSlideTouchEventsToScrollLayoutAreas(boolean onlyRestrictingSlideTouchEventsToScrollLayoutAreas) {
|
|
|
- this.onlyRestrictingSlideTouchEventsToScrollLayoutAreas = onlyRestrictingSlideTouchEventsToScrollLayoutAreas;
|
|
|
+ public BottomDialog setScrollableWhenContentLargeThanVisibleRange(boolean scrollableWhenContentLargeThanVisibleRange) {
|
|
|
+ this.scrollableWhenContentLargeThanVisibleRange = scrollableWhenContentLargeThanVisibleRange;
|
|
|
return this;
|
|
|
}
|
|
|
}
|