Merge pull request Blankj#456 from LambertCoding/master

Fix memory leak in ToastUtils. Add a method to set the text size.

Author: Blankj

utilcode/src/main/java/com/blankj/utilcode/util/ToastUtils.java

@@ -20,6 +20,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import java.lang.ref.WeakReference;
+
 /**
  * <pre>
  *     author: Blankj
@@ -30,16 +32,17 @@
  */
 public final class ToastUtils {
 
-    private static final int     COLOR_DEFAULT = 0xFEFFFFFF;
-    private static final Handler HANDLER       = new Handler(Looper.getMainLooper());
+    private static final int COLOR_DEFAULT = 0xFEFFFFFF;
+    private static final Handler HANDLER = new Handler(Looper.getMainLooper());
 
-    private static Toast sToast;
-    private static int sGravity    = -1;
-    private static int sXOffset    = -1;
-    private static int sYOffset    = -1;
-    private static int sBgColor    = COLOR_DEFAULT;
+    private static WeakReference<Toast> sToast;
+    private static int sGravity = -1;
+    private static int sXOffset = -1;
+    private static int sYOffset = -1;
+    private static int sBgColor = COLOR_DEFAULT;
     private static int sBgResource = -1;
-    private static int sMsgColor   = COLOR_DEFAULT;
+    private static int sMsgColor = COLOR_DEFAULT;
+    private static int sMsgTextSize = -1;
 
     private ToastUtils() {
         throw new UnsupportedOperationException("u can't instantiate me...");
@@ -85,6 +88,15 @@ public static void setMsgColor(@ColorInt final int msgColor) {
         sMsgColor = msgColor;
     }
 
+    /**
+     * Set the text size of message.
+     *
+     * @param textSize The text size of message.
+     */
+    public static void setMsgTextSize(final int textSize) {
+        sMsgTextSize = textSize;
+    }
+
     /**
      * Show the toast for a short period of time.
      *
@@ -199,8 +211,9 @@ public static View showCustomLong(@LayoutRes final int layoutId) {
      * Cancel the toast.
      */
     public static void cancel() {
-        if (sToast != null) {
-            sToast.cancel();
+        Toast toast;
+        if (sToast != null && (toast = sToast.get()) != null) {
+            toast.cancel();
             sToast = null;
         }
     }
@@ -222,8 +235,9 @@ private static void show(final CharSequence text, final int duration) {
             @Override
             public void run() {
                 cancel();
-                sToast = Toast.makeText(Utils.getTopActivityOrApp(), text, duration);
-                final TextView tvMessage = sToast.getView().findViewById(android.R.id.message);
+                Toast toast = Toast.makeText(Utils.getTopActivityOrApp(), text, duration);
+                sToast = new WeakReference<>(toast);
+                final TextView tvMessage = toast.getView().findViewById(android.R.id.message);
                 int msgColor = tvMessage.getCurrentTextColor();
                 //it solve the font of toast
                 TextViewCompat.setTextAppearance(tvMessage, android.R.style.TextAppearance);
@@ -232,11 +246,14 @@ public void run() {
                 } else {
                     tvMessage.setTextColor(msgColor);
                 }
+                if (sMsgTextSize != -1) {
+                    tvMessage.setTextSize(sMsgTextSize);
+                }
                 if (sGravity != -1 || sXOffset != -1 || sYOffset != -1) {
-                    sToast.setGravity(sGravity, sXOffset, sYOffset);
+                    toast.setGravity(sGravity, sXOffset, sYOffset);
                 }
-                setBg(tvMessage);
-                sToast.show();
+                setBg(toast, tvMessage);
+                toast.show();
             }
         });
     }
@@ -246,20 +263,22 @@ private static void show(final View view, final int duration) {
             @Override
             public void run() {
                 cancel();
-                sToast = new Toast(Utils.getTopActivityOrApp());
-                sToast.setView(view);
-                sToast.setDuration(duration);
+                Toast toast = new Toast(Utils.getTopActivityOrApp());
+                sToast = new WeakReference<>(toast);
+
+                toast.setView(view);
+                toast.setDuration(duration);
                 if (sGravity != -1 || sXOffset != -1 || sYOffset != -1) {
-                    sToast.setGravity(sGravity, sXOffset, sYOffset);
+                    toast.setGravity(sGravity, sXOffset, sYOffset);
                 }
-                setBg();
-                sToast.show();
+                setBg(toast);
+                toast.show();
             }
         });
     }
 
-    private static void setBg() {
-        View toastView = sToast.getView();
+    private static void setBg(Toast toast) {
+        View toastView = toast.getView();
         if (sBgResource != -1) {
             toastView.setBackgroundResource(sBgResource);
         } else if (sBgColor != COLOR_DEFAULT) {
@@ -274,8 +293,8 @@ private static void setBg() {
         }
     }
 
-    private static void setBg(final TextView tvMsg) {
-        View toastView = sToast.getView();
+    private static void setBg(final Toast toast, final TextView tvMsg) {
+        View toastView = toast.getView();
         if (sBgResource != -1) {
             toastView.setBackgroundResource(sBgResource);
             tvMsg.setBackgroundColor(Color.TRANSPARENT);