Revert "解决xtoast内存泄漏的问题"

This reverts commit 8ef453a

Author: xuexiangjys

app/build.gradle

@@ -103,8 +103,8 @@ dependencies {
     implementation 'com.github.bumptech.glide:glide:4.12.0'
 
     // XUI框架
-    implementation project(':xui_lib')
-//    implementation 'com.github.xuexiangjys:XUI:1.1.9'
+//    implementation project(':xui_lib')
+    implementation 'com.github.xuexiangjys:XUI:1.1.9'
 //    implementation 'com.qmuiteam:qmui:1.2.0'
 
     // 工具类

xui_lib/src/main/java/com/xuexiang/xui/widget/toast/XToast.java

@@ -4,7 +4,6 @@
 import android.content.Context;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
-import android.os.Build;
 import android.util.TypedValue;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -312,9 +311,6 @@ public static Toast custom(@NonNull Context context, @NonNull CharSequence messa
             if (icon == null) {
                 throw new IllegalArgumentException("Avoid passing 'icon' as null if 'withIcon' is set to true");
             }
-            if (Config.get().isRTL && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-                toastLayout.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
-            }
             Utils.setBackground(toastIcon, Config.get().tintIcon ? Utils.tintIcon(icon, textColor) : icon);
         } else {
             toastIcon.setVisibility(View.GONE);
@@ -330,26 +326,15 @@ public static Toast custom(@NonNull Context context, @NonNull CharSequence messa
             toastLayout.getBackground().setAlpha(Config.get().alpha);
         }
         currentToast.setView(toastLayout);
-        if (Config.get().gravity != -1) {
-            currentToast.setGravity(Config.get().gravity, Config.get().xOffset, Config.get().yOffset);
-        }
+
         if (!Config.get().allowQueue) {
             if (lastToast != null) {
                 lastToast.cancel();
             }
             lastToast = currentToast;
-            // solve the problem of lastToast memory leak
-            currentToast.getView().addOnAttachStateChangeListener(new View.OnAttachStateChangeListener() {
-                @Override
-                public void onViewAttachedToWindow(View v) {}
-                @Override
-                public void onViewDetachedFromWindow(View v) {
-                    v.removeOnAttachStateChangeListener(this);
-                    if (currentToast == lastToast) {
-                        lastToast = null;
-                    }
-                }
-            });
+        }
+        if (Config.get().gravity != -1) {
+            currentToast.setGravity(Config.get().gravity, Config.get().xOffset, Config.get().yOffset);
         }
         return currentToast;
     }
@@ -366,7 +351,6 @@ public static class Config {
         private int gravity = -1;
         private int xOffset = 0;
         private int yOffset = 0;
-        private boolean isRTL = false;
 
         private Config() {
 
@@ -375,7 +359,7 @@ private Config() {
         /**
          * 获取单例
          *
-         * @return 配置
+         * @return
          */
         public static Config get() {
             if (sInstance == null) {
@@ -397,7 +381,6 @@ public void reset() {
             gravity = -1;
             xOffset = 0;
             yOffset = 0;
-            isRTL = false;
         }
 
         @CheckResult
@@ -459,10 +442,5 @@ public Config setYOffset(int yOffset) {
             this.yOffset = yOffset;
             return this;
         }
-
-        public Config setRTL(boolean isRTL) {
-            this.isRTL = isRTL;
-            return this;
-        }
     }
 }