Refactor EasyToast

Author: yjfnypeu

app/src/main/java/com/haoge/sample/easyandroid/activities/EasyToastActivity.kt

@@ -1,6 +1,7 @@
 package com.haoge.sample.easyandroid.activities
 
 import android.view.Gravity
+import android.widget.Toast
 import butterknife.OnClick
 import com.haoge.easyandroid.easy.EasyToast
 import com.haoge.sample.easyandroid.BaseActivity
@@ -15,9 +16,11 @@ class EasyToastActivity : BaseActivity(){
 
     val default by lazy { EasyToast.DEFAULT }
     val creator by lazy {
+        // 创建自定义的Toast.
         EasyToast.newBuilder(R.layout.toast_style, R.id.toast_tv)
-            .setGravity(Gravity.CENTER, 0, 0)
-            .build()
+                .setDuration(Toast.LENGTH_LONG)
+                .setGravity(Gravity.CENTER, 0, 0)
+                .build()
     }
 
     override fun getLayoutId(): Int {

utils/src/main/java/com/haoge/easyandroid/EasyAndroid.kt

@@ -9,21 +9,6 @@ import android.content.Context
 @SuppressLint("StaticFieldLeak")
 object EasyAndroid {
 
-    /**
-     * 提供给框架内部使用的常量。判断是否是debug|release包
-     *
-     * 其为**BuildConfig.DEBUG**的值
-     */
-    internal val DEBUG by lazy {
-        return@lazy try {
-            val clazz = Class.forName(context!!.packageName + ".BuildConfig")
-            val field = clazz.getDeclaredField("DEBUG")
-            field.get(clazz) as Boolean
-        } catch (e:Exception) {
-            false
-        }
-    }
-
     private var context:Context? = null
 
     fun getApplicationContext():Context {

utils/src/main/java/com/haoge/easyandroid/easy/EasyToast.kt

@@ -1,6 +1,7 @@
 package com.haoge.easyandroid.easy
 
 import android.annotation.SuppressLint
+import android.content.Context
 import android.os.Handler
 import android.os.Looper
 import android.text.TextUtils
@@ -18,8 +19,12 @@ import com.haoge.easyandroid.EasyAndroid
  */
 class EasyToast private constructor(private val builder:Builder) {
 
+    private val context: Context = EasyAndroid.getApplicationContext()
+    private var toast:Toast? = null
+    private var tv:TextView? = null
+
     fun show(resId:Int) {
-        show(EasyAndroid.getApplicationContext().getString(resId))
+        show(context.getString(resId))
     }
 
     fun show(message:String?, vararg any: Any) {
@@ -43,29 +48,29 @@ class EasyToast private constructor(private val builder:Builder) {
         createToastIfNeeded()
 
         if (builder.isDefault) {
-            builder.toast?.setText(message)
-            builder.toast?.show()
+            toast?.setText(message)
+            toast?.show()
         } else {
-            builder.tv?.text = message
-            builder.toast?.show()
+            tv?.text = message
+            toast?.show()
         }
     }
 
     @SuppressLint("ShowToast")
     private fun createToastIfNeeded() {
-        if (builder.toast == null) {
+        if (toast == null) {
             if (builder.isDefault) {
-                builder.toast = Toast.makeText(EasyAndroid.getApplicationContext(), "", Toast.LENGTH_SHORT)
+                toast = Toast.makeText(context, "", Toast.LENGTH_SHORT)
             } else {
-                val container = LayoutInflater.from(EasyAndroid.getApplicationContext()).inflate(builder.layoutId, null)
-                builder.tv = container.findViewById(builder.tvId)
-                builder.toast = Toast(EasyAndroid.getApplicationContext())
-                builder.toast?.view = container
-                builder.toast?.duration = builder.duration
+                val container = LayoutInflater.from(context).inflate(builder.layoutId, null)
+                tv = container.findViewById(builder.tvId)
+                toast = Toast(context)
+                toast?.view = container
+                toast?.duration = builder.duration
             }
 
             if (builder.gravity != 0) {
-                builder.toast?.setGravity(builder.gravity, builder.offsetX, builder.offsetY)
+                toast?.setGravity(builder.gravity, builder.offsetX, builder.offsetY)
             }
         }
     }
@@ -94,8 +99,6 @@ class EasyToast private constructor(private val builder:Builder) {
     class Builder(internal var isDefault: Boolean,
                   internal var layoutId: Int,
                   internal var tvId: Int) {
-        internal var toast:Toast? = null
-        internal var tv:TextView? = null
 
         internal var duration:Int = Toast.LENGTH_SHORT
         internal var gravity:Int = 0