处理项目出现的代码警告

新增 showAsDropDown 方法
优化判断 View 是否移动代码的逻辑

Author: getActivity

README.md

@@ -1,6 +1,6 @@
 # 悬浮窗框架
 
-* 码云地址：[Gitee](https://gitee.com/getActivity/XToast)
+* 项目地址：[Github](https://github.com/getActivity/XToast)、[码云](https://gitee.com/getActivity/XToast)
 
 * 博客地址：[悬浮窗需求终结者](https://www.jianshu.com/p/247d705b87b6)
 
@@ -16,11 +16,12 @@
 
 ```groovy
 buildscript {
-    ......
+    repositories {
+        maven { url 'https://jitpack.io' }
+    }
 }
 allprojects {
     repositories {
-        // JitPack 远程仓库：https://jitpack.io
         maven { url 'https://jitpack.io' }
     }
 }
@@ -31,7 +32,7 @@ allprojects {
 ```groovy
 dependencies {
     // 悬浮窗框架：https://github.com/getActivity/XToast
-    implementation 'com.github.getActivity:XToast:6.9'
+    implementation 'com.github.getActivity:XToast:8.0'
 }
 ```
 
@@ -137,7 +138,7 @@ public final class FloatingLifecycle implements Application.ActivityLifecycleCal
     @Override
     public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
         new XToast<>(activity)
-                .setXXXX()
+                .setXxx()
                 .show();
     }
 
@@ -221,4 +222,4 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-```
+```

XToast.apk

@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.xtoast.demo"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 69
-        versionName "6.9"
+        versionCode 80
+        versionName "8.0"
     }
     buildTypes {
         release {
@@ -29,18 +29,19 @@ dependencies {
     implementation fileTree(include: ['*.aar'], dir: 'libs')
     implementation project(':library')
 
-    // 谷歌兼容库：https://developer.android.google.cn/jetpack/androidx/releases/appcompat?hl=zh-cn
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    // AppCompat 库：https://developer.android.google.cn/jetpack/androidx/releases/appcompat?hl=zh-cn
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    // Material 库：https://github.com/material-components/material-components-android
+    implementation 'com.google.android.material:material:1.3.0'
 
     // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.github.getActivity:XXPermissions:10.6'
+    implementation 'com.github.getActivity:XXPermissions:11.6'
 
     // 标题栏框架：https://github.com/getActivity/TitleBar
-    implementation 'com.github.getActivity:TitleBar:8.5'
+    implementation 'com.github.getActivity:TitleBar:8.6'
 
     // 吐司框架：https://github.com/getActivity/ToastUtils
-    implementation 'com.github.getActivity:ToastUtils:9.0'
+    implementation 'com.github.getActivity:ToastUtils:9.5'
 
     // 内存泄漏捕捉：https://github.com/square/leakcanary
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'

app/build.gradle

@@ -86,7 +86,7 @@ public void show4(View v) {
                     @Override
                     public void onClick(final XToast<?> toast, TextView view) {
                         view.setText("那么听话啊");
-                        getWindow().getDecorView().postDelayed(new Runnable() {
+                        toast.postDelayed(new Runnable() {
                             @Override
                             public void run() {
                                 toast.cancel();
@@ -98,6 +98,23 @@ public void run() {
     }
 
     public void show5(View v) {
+        new XToast<>(this)
+                .setView(R.layout.toast_hint)
+                .setAnimStyle(android.R.style.Animation_Translucent)
+                .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
+                .setDuration(2000)
+                .setText(android.R.id.message, "位置算的准不准")
+                .setOnClickListener(android.R.id.message, new XToast.OnClickListener<TextView>() {
+
+                    @Override
+                    public void onClick(final XToast<?> toast, TextView view) {
+                        toast.cancel();
+                    }
+                })
+                .showAsDropDown(v, Gravity.BOTTOM);
+    }
+
+    public void show6(View v) {
         new XToast<>(this)
                 .setView(R.layout.toast_hint)
                 .setAnimStyle(android.R.style.Animation_Translucent)
@@ -119,7 +136,7 @@ public void onClick(XToast<?> toast, TextView view) {
                 .show();
     }
 
-    public void show6(View v) {
+    public void show7(View v) {
         XXPermissions.with(this)
                 .permission(Permission.SYSTEM_ALERT_WINDOW)
                 .request(new OnPermissionCallback() {
@@ -161,7 +178,7 @@ public void onDenied(List<String> denied, boolean never) {
                 });
     }
 
-    public void show7(View v) {
+    public void show8(View v) {
         // 将 ToastUtils 中的 View 转移给 XToast 来显示
         new XToast<>(this)
                 .setDuration(1000)

app/src/main/java/com/hjq/xtoast/demo/MainActivity.java

@@ -61,22 +61,30 @@
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="30dp"
                 android:onClick="show5"
-                android:text="可自由拖拽的 Toast" />
+                android:text="显示在 View 下方" />
 
             <Button
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="30dp"
                 android:onClick="show6"
-                android:text="全局可拖拽的 Toast" />
+                android:text="可自由拖拽的 Toast" />
 
             <Button
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:layout_marginTop="30dp"
                 android:onClick="show7"
+                android:text="全局可拖拽的 Toast" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="30dp"
+                android:onClick="show8"
                 android:text="搭配 ToastUtils 吐司框架" />
         </LinearLayout>
 

app/src/main/res/layout/activity_main.xml

@@ -9,6 +9,7 @@ buildscript {
         maven { url 'https://jitpack.io' }
         mavenCentral()
         google()
+        // noinspection JcenterRepositoryObsolete
         jcenter()
     }
     dependencies {
@@ -24,6 +25,7 @@ allprojects {
         maven { url 'https://jitpack.io' }
         mavenCentral()
         google()
+        // noinspection JcenterRepositoryObsolete
         jcenter()
     }
 }

build.gradle

@@ -5,8 +5,15 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionCode 69
-        versionName "6.9"
+        versionCode 80
+        versionName "8.0"
+    }
+
+    android.libraryVariants.all { variant ->
+        // aar 输出文件名配置
+        variant.outputs.all { output ->
+            outputFileName = "xtoast-${android.defaultConfig.versionName}.aar"
+        }
     }
 }
 

library/build.gradle

@@ -86,9 +86,6 @@ public void onActivityDestroyed(Activity activity) {
         if (mToast == null) {
             return;
         }
-        if (mToast.isShow()) {
-            mToast.cancel();
-        }
         mToast.recycle();
         mToast = null;
     }