Merge branch 'master' of github.com:YMLopez/ToastUtils

# Conflicts:
#	.idea/caches/build_file_checksums.ser
#	app/build.gradle
#	app/src/main/java/com/lopez/toast/ToastApplication.java

Author: YMLopez

README.md

@@ -77,9 +77,9 @@ allprojects {
 在你app的gradle里面添加：
 </br></br>
 
-dependencies {
-	        implementation 'com.github.YMLopez:ToastUtils:1.0.0'
-	}
+implementation('com.github.YMLopez:ToastUtils:1.0.2'){
+        exclude group: 'com.android.support'
+    }
 
 </br></br>
 

app/src/main/java/com/lopez/toast/MainActivity.java

@@ -1,26 +1,26 @@
 package com.lopez.toast;
 
-import android.support.v7.app.AppCompatActivity;
+import android.app.Activity;
 import android.os.Bundle;
 import android.view.View;
 
 
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends Activity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-
+        //也可以在Application中初始化
         /*ToastUtils toast = ToastUtils.initToast(this);
         toast.setLayout(R.layout.toast_layout_white);*/
     }
 
     public void hello(View view) {
         //ToastUtils.showToast("你好啊！");
         //ToastUtils.showToast(R.string.hi, 1000);
-        ToastUtils.showToastLong("我很菜呀~");
+        //ToastUtils.showToastLong("我很菜呀~");
     }
 
 }

build.gradle

@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.3'
+        classpath 'com.android.tools.build:gradle:3.1.4'
 
 
         // NOTE: Do not place your application dependencies here; they belong