diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java index 9d461d18..c4220f6e 100644 --- a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java +++ b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java @@ -12,6 +12,7 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.BaseAdapter; +import android.widget.LinearLayout; import androidx.annotation.ColorInt; import androidx.annotation.ColorRes; @@ -625,7 +626,6 @@ public void onItemClick(AdapterView parent, View view, int position, long id) ViewGroup.LayoutParams listViewLp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); getDialogImpl().boxList.addView(listView, listViewLp); - refreshUI(); } } diff --git a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageMenu.java b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageMenu.java index 08a997e5..503f22f4 100644 --- a/DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageMenu.java +++ b/DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageMenu.java @@ -12,6 +12,7 @@ import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.BaseAdapter; +import android.widget.LinearLayout; import androidx.annotation.ColorInt; import androidx.annotation.ColorRes; @@ -504,7 +505,6 @@ protected void onDialogShow() { dividerDrawableResId = isLightTheme() ? R.drawable.rect_dialogx_material_menu_split_divider : R.drawable.rect_dialogx_material_menu_split_divider_night; } - if (!isLightTheme()) { listView = new DialogListView(getDialogImpl(), getOwnActivity(), R.style.DialogXCompatThemeDark); } else { @@ -618,7 +618,6 @@ public void onItemClick(AdapterView parent, View view, int position, long id) ViewGroup.LayoutParams listViewLp = new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT); getDialogImpl().boxList.addView(listView, listViewLp); - refreshUI(); } } diff --git a/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml b/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml index dd349a33..99fd5ef5 100644 --- a/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml +++ b/DialogX/src/main/res/layout/layout_dialogx_bottom_material.xml @@ -50,45 +50,52 @@ android:textColor="@color/black" android:textSize="21dp" /> - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never" + android:scrollbars="vertical"> - - - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never" + android:scrollbars="vertical"> - - - - - - - + android:orientation="vertical"> + + + + + + + + + + - + - + android:layout_weight="1" + android:orientation="vertical"> - - - - - + android:overScrollMode="never"> - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + + - - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never"> - - - + android:orientation="vertical"> + + + + + + + + + + + - - - - - - + - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical" + android:scrollbars="vertical"> - - - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + - + @@ -136,8 +144,8 @@ + android:background="@color/dialogxIOSSplitLight" + android:tag="imgPositiveButtonSplit" /> + android:background="@color/dialogxIOSSplitLight" + android:tag="imgOtherButtonSplit" /> - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark" + android:scrollbars="vertical"> - - - - - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + + @@ -118,8 +125,8 @@ android:divider="@drawable/rect_dialogx_ios_menu_split_divider" android:orientation="vertical" android:showDividers="middle" - app:dialogxOverlayColorNoAlpha="true" - app:dialogxDarkMode="true"> + app:dialogxDarkMode="true" + app:dialogxOverlayColorNoAlpha="true"> - - + android:layout_weight="1" + android:orientation="vertical"> - - - - - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical" + android:scrollbars="vertical"> - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + + - - + android:layout_weight="1" + android:orientation="vertical"> - - - - - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark" + android:scrollbars="vertical"> - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + + - + android:layout_weight="1" + android:orientation="vertical"> - - - - - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbars="vertical"> - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + - + android:layout_weight="1" + android:orientation="vertical"> - - - - - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbars="vertical"> - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + + + diff --git a/DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue.xml b/DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue.xml index 3f5d4f86..8c4e8476 100644 --- a/DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue.xml +++ b/DialogXKongzueStyle/src/main/res/layout/layout_dialogx_kongzue.xml @@ -39,72 +39,78 @@ android:textColor="@color/black" android:textSize="20dp" /> - - + android:layout_weight="1" + android:orientation="vertical"> - - - - - + android:overScrollMode="never"> - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + + - - + android:orientation="vertical" + android:layout_weight="1"> - + android:overScrollMode="never"> - - - + android:orientation="vertical"> + + + + + + + + + + + + - - - - - - - + - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical" + android:scrollbars="vertical"> - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + - + - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark" + android:scrollbars="vertical"> - - - - - - - - - + android:layout_height="wrap_content" + android:orientation="vertical"> + + + + + + + + + + + - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical" + android:scrollbars="vertical"> - - - + android:orientation="vertical"> + + + + + + + + + + + + - - - - - - - + - + android:layout_weight="1" + android:orientation="vertical"> - - - - - + android:overScrollMode="never" + android:scrollbarSize="7dp" + android:scrollbarThumbVertical="@drawable/scrollbar_dialogx_vertical_dark" + android:scrollbars="vertical"> - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + + + android:orientation="vertical" + android:theme="@style/DialogXCompatThemeLight"> - + android:layout_weight="1"> - + android:overScrollMode="never" + android:scrollbars="vertical"> - - - - - - - - - + android:orientation="vertical"> + + + + + + + + + + + + android:orientation="vertical" + android:theme="@style/DialogXCompatThemeNight"> - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never" + android:scrollbars="vertical"> - - - - - - - + android:orientation="vertical"> + + + + + + + + + + - + - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never"> - - - + android:orientation="vertical"> - - - - - + android:textSize="16dp" /> - - - + - + + + + + + + + + + + + - + android:layout_weight="1" + android:orientation="vertical"> - + android:overScrollMode="never"> - - - + android:orientation="vertical"> - - - - - + android:textSize="16dp" /> - + - + + + + + + + + + + + - +