0.0.50.beta34.pre

- Lifecycle.State.DESTROYED 时机调整到销毁 dialogImpl 之前；
- CustomDialog 中监听 baseView 位置变化的 OnDrawListener 修改为 OnPreDrawListener 以解决部分系统存在的兼容性问题；
- BaseDialog 新增 callDialogDismiss() 用于调用对应对话框实例的 dismiss()
- 新增 bindDismissWithLifecycleOwner(LifecycleOwner) 用于绑定具备特定生命周期的组件，当组件关闭时自动关闭对话框；

DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomDialog.java

@@ -23,7 +23,9 @@ import android.widget.TextView;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1425,13 +1427,23 @@ public class BottomDialog extends BaseDialog implements DialogXBaseBottomDialog
         return this;
     }
 
-    public BottomDialog cleanAction(int actionId){
+    public BottomDialog cleanAction(int actionId) {
         dialogActionRunnableMap.remove(actionId);
         return this;
     }
 
-    public BottomDialog cleanAllAction(){
+    public BottomDialog cleanAllAction() {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss() {
+        dismiss();
+    }
+
+    public BottomDialog bindDismissWithLifecycleOwner(LifecycleOwner owner) {
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/BottomMenu.java

@@ -16,6 +16,7 @@ import android.widget.LinearLayout;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1578,4 +1579,14 @@ public class BottomMenu extends BottomDialog {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    protected void callDialogDismissPrivate(){
+        dismiss();
+    }
+
+    public BottomMenu bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/CustomDialog.java

@@ -16,6 +16,7 @@ import android.widget.RelativeLayout;
 import androidx.annotation.ColorInt;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1182,4 +1183,14 @@ public class CustomDialog extends BaseDialog {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public CustomDialog bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/FullScreenDialog.java

@@ -20,6 +20,7 @@ import android.widget.RelativeLayout;
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1010,4 +1011,14 @@ public class FullScreenDialog extends BaseDialog implements DialogXBaseBottomDia
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public FullScreenDialog bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/GuideDialog.java

@@ -19,6 +19,7 @@ import android.widget.ImageView;
 import android.widget.RelativeLayout;
 
 import androidx.annotation.ColorInt;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -838,4 +839,14 @@ public class GuideDialog extends CustomDialog {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public GuideDialog bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/InputDialog.java

@@ -9,6 +9,7 @@ import android.view.View;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -745,4 +746,14 @@ public class InputDialog extends MessageDialog {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public InputDialog bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageDialog.java

@@ -31,6 +31,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1598,4 +1599,14 @@ public class MessageDialog extends BaseDialog {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public MessageDialog bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/MessageMenu.java

@@ -16,6 +16,7 @@ import android.widget.LinearLayout;
 
 import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1571,4 +1572,14 @@ public class MessageMenu extends MessageDialog {
         return this;
     }
 
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public MessageMenu bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
+
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/PopMenu.java

@@ -25,6 +25,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1544,4 +1545,14 @@ public class PopMenu extends BaseDialog {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public PopMenu bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/PopNotification.java

@@ -25,6 +25,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1613,4 +1614,14 @@ public class PopNotification extends BaseDialog implements NoTouchInterface {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public PopNotification bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/PopTip.java

@@ -23,6 +23,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1431,4 +1432,14 @@ public class PopTip extends BaseDialog implements NoTouchInterface {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public PopTip bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/TipDialog.java

@@ -4,6 +4,8 @@ import android.app.Activity;
 import android.os.Build;
 import android.text.TextUtils;
 
+import androidx.lifecycle.LifecycleOwner;
+
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.interfaces.DialogXAnimInterface;
 import com.kongzue.dialogx.interfaces.DialogXRunnable;
@@ -298,4 +300,14 @@ public class TipDialog extends WaitDialog {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public TipDialog bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/dialogs/WaitDialog.java

@@ -21,6 +21,7 @@ import androidx.annotation.ColorInt;
 import androidx.annotation.ColorRes;
 import androidx.annotation.Nullable;
 import androidx.lifecycle.Lifecycle;
+import androidx.lifecycle.LifecycleOwner;
 
 import com.kongzue.dialogx.DialogX;
 import com.kongzue.dialogx.R;
@@ -1333,4 +1334,14 @@ public class WaitDialog extends BaseDialog {
         dialogActionRunnableMap.clear();
         return this;
     }
+
+    // for BaseDialog use
+    public void callDialogDismiss(){
+        dismiss();
+    }
+
+    public WaitDialog bindDismissWithLifecycleOwner(LifecycleOwner owner){
+        super.bindDismissWithLifecycleOwnerPrivate(owner);
+        return this;
+    }
 }

DialogX/src/main/java/com/kongzue/dialogx/interfaces/BaseDialog.java

@@ -1155,4 +1155,19 @@ public abstract class BaseDialog implements LifecycleOwner {
         }
         return false;
     }
+
+    public abstract void callDialogDismiss();
+
+    protected void bindDismissWithLifecycleOwnerPrivate(LifecycleOwner owner) {
+        if (owner == null) return;
+        owner.getLifecycle().addObserver(new LifecycleEventObserver() {
+            @Override
+            public void onStateChanged(@NonNull LifecycleOwner source, @NonNull Lifecycle.Event event) {
+                if (event == Lifecycle.Event.ON_STOP || event == Lifecycle.Event.ON_DESTROY) {
+                    callDialogDismiss();
+                    source.getLifecycle().removeObserver(this);
+                }
+            }
+        });
+    }
 }

app/src/main/java/com/kongzue/dialogxdemo/activity/MainActivity.java

@@ -6,12 +6,10 @@ import android.animation.ValueAnimator;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.content.res.ColorStateList;
 import android.content.res.Configuration;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Color;
-import android.graphics.Rect;
 import android.graphics.RenderEffect;
 import android.graphics.Shader;
 import android.net.Uri;
@@ -20,7 +18,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.Looper;
 import android.provider.Settings;
-import android.text.InputType;
 import android.text.SpannableString;
 import android.text.Spanned;
 import android.text.TextPaint;
@@ -37,7 +34,6 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.AdapterView;
 import android.widget.EditText;
-import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
@@ -45,8 +41,9 @@ import android.widget.TextView;
 import android.widget.Toast;
 
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatDelegate;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -78,28 +75,22 @@ import com.kongzue.dialogx.interfaces.BaseDialog;
 import com.kongzue.dialogx.interfaces.BottomDialogSlideEventLifecycleCallback;
 import com.kongzue.dialogx.interfaces.DialogLifecycleCallback;
 import com.kongzue.dialogx.interfaces.DialogXAnimInterface;
-import com.kongzue.dialogx.interfaces.DialogXRunnable;
-import com.kongzue.dialogx.interfaces.DialogXStyle;
 import com.kongzue.dialogx.interfaces.MenuIconAdapter;
 import com.kongzue.dialogx.interfaces.MenuItemTextInfoInterceptor;
 import com.kongzue.dialogx.interfaces.OnBackPressedListener;
 import com.kongzue.dialogx.interfaces.OnBackgroundMaskClickListener;
 import com.kongzue.dialogx.interfaces.OnBindView;
-import com.kongzue.dialogx.interfaces.OnBindingView;
 import com.kongzue.dialogx.interfaces.OnDialogButtonClickListener;
 import com.kongzue.dialogx.interfaces.OnIconChangeCallBack;
 import com.kongzue.dialogx.interfaces.OnInputDialogButtonClickListener;
 import com.kongzue.dialogx.interfaces.OnMenuButtonClickListener;
 import com.kongzue.dialogx.interfaces.OnMenuItemClickListener;
 import com.kongzue.dialogx.interfaces.OnMenuItemSelectListener;
-import com.kongzue.dialogx.interfaces.OnSafeInsetsChangeListener;
 import com.kongzue.dialogx.style.IOSStyle;
 import com.kongzue.dialogx.style.KongzueStyle;
 import com.kongzue.dialogx.style.MIUIStyle;
 import com.kongzue.dialogx.style.MaterialStyle;
-import com.kongzue.dialogx.util.InputInfo;
 import com.kongzue.dialogx.util.TextInfo;
-import com.kongzue.dialogx.util.WindowUtil;
 import com.kongzue.dialogxdemo.BuildConfig;
 import com.kongzue.dialogxdemo.R;
 import com.kongzue.dialogxdemo.custom.recycleview.CustomRecycleViewAdapter;
@@ -483,6 +474,9 @@ public class MainActivity extends BaseActivity {
             }
         });
 
+        BottomDialog dialog = null;
+        dialog.callDialogDismiss();
+        
         btnFullScreenDialogFragment.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -1174,7 +1168,7 @@ public class MainActivity extends BaseActivity {
                         .setDialogLifecycleCallback(new DialogLifecycleCallback<CustomDialog>() {
                             @Override
                             public void onShow(CustomDialog dialog) {
-                                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                                     RenderEffect blurEffect = RenderEffect.createBlurEffect(20f, 20f, Shader.TileMode.CLAMP);
                                     ((ViewGroup) getWindow().getDecorView()).getChildAt(0).setRenderEffect(blurEffect);
                                 }
@@ -1182,7 +1176,7 @@ public class MainActivity extends BaseActivity {
 
                             @Override
                             public void onDismiss(CustomDialog dialog) {
-                                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
+                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
                                     ((ViewGroup) getWindow().getDecorView()).getChildAt(0).setRenderEffect(null);
                                 }
                             }