0.0.40.beta13

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

@@ -30,9 +30,10 @@ public class TipDialog extends WaitDialog {
     public static WaitDialog show(Activity activity, int messageResId) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(messageResId, TYPE.WARNING);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(messageResId, TYPE.WARNING);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(CharSequence message) {
@@ -46,9 +47,10 @@ public class TipDialog extends WaitDialog {
     public static WaitDialog show(Activity activity, CharSequence message) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(message, TYPE.WARNING);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(message, TYPE.WARNING);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(int messageResId, TYPE tip) {
@@ -62,9 +64,10 @@ public class TipDialog extends WaitDialog {
     public static WaitDialog show(Activity activity, int messageResId, TYPE tip) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(messageResId, tip);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(messageResId, tip);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(CharSequence message, TYPE tip) {
@@ -78,9 +81,10 @@ public class TipDialog extends WaitDialog {
     public static WaitDialog show(Activity activity, CharSequence message, TYPE tip) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(message, tip);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(message, tip);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(int messageResId, TYPE tip, long duration) {
@@ -95,10 +99,11 @@ public class TipDialog extends WaitDialog {
     public static WaitDialog show(Activity activity, int messageResId, TYPE tip, long duration) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(messageResId, tip);
-        me().setTipShowDuration(duration);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(messageResId, tip);
+        instance.setTipShowDuration(duration);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(CharSequence message, TYPE tip, long duration) {
@@ -113,10 +118,11 @@ public class TipDialog extends WaitDialog {
     public static WaitDialog show(Activity activity, CharSequence message, TYPE tip, long duration) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(message, tip);
-        me().setTipShowDuration(duration);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(message, tip);
+        instance.setTipShowDuration(duration);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     @Override

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

@@ -111,9 +111,10 @@ public class WaitDialog extends BaseDialog {
     public static WaitDialog show(Activity activity, int messageResId) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(messageResId, TYPE.NONE);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(messageResId, TYPE.NONE);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(CharSequence message, float progress) {
@@ -128,10 +129,11 @@ public class WaitDialog extends BaseDialog {
     public static WaitDialog show(Activity activity, CharSequence message, float progress) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(message, TYPE.NONE);
-        me().setProgress(progress);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(message, TYPE.NONE);
+        instance.setProgress(progress);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(int messageResId, float progress) {
@@ -146,19 +148,21 @@ public class WaitDialog extends BaseDialog {
     public static WaitDialog show(Activity activity, int messageResId, float progress) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(messageResId, TYPE.NONE);
-        me().setProgress(progress);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(messageResId, TYPE.NONE);
+        instance.setProgress(progress);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(Activity activity, float progress) {
         boolean noInstance = noInstance(activity);
         if (noInstance) instanceBuild();
-        me().setTip(TYPE.NONE);
-        me().setProgress(progress);
+        WaitDialog instance = getInstanceNotNull(activity);
+        instance.setTip(TYPE.NONE);
+        instance.setProgress(progress);
         showWithInstance(noInstance, activity);
-        return me();
+        return instance;
     }
     
     public static WaitDialog show(float progress) {