修复点击拖动出现回弹的 Bug

优化默认 Gravity 配置优化监听器类存放的位置
getActivity · Mar 21, 2021 · ad08005 · ad08005
1 parent 097e4ad
commit ad08005
Show file tree

Hide file tree

Showing 20 changed files with 313 additions and 210 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,11 +1,9 @@
-/.gradle
-/.idea
-/build
-*/build
-/captures
-/.cxx
-*/.cxx
-/.externalNativeBuild
+.gradle
+.idea
+.cxx
+.externalNativeBuild
+build
+captures
 
 ._*
 *.iml

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@
 ```groovy
 dependencies {
     // 悬浮窗框架：https://github.com/getActivity/XToast
-    implementation 'com.hjq:xtoast:6.6'
+    implementation 'com.hjq:xtoast:6.8'
 }
 ```
 
@@ -40,7 +40,7 @@ new XToast<>(XToastActivity.this)
         //.setBackgroundDimAmount(0.5f)
         .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
         .setText(android.R.id.message, "点我消失")
-        .setOnClickListener(android.R.id.message, new OnClickListener<TextView>() {
+        .setOnClickListener(android.R.id.message, new XToast.OnClickListener<TextView>() {
 
             @Override
             public void onClick(XToast toast, TextView view) {
@@ -53,7 +53,31 @@ new XToast<>(XToastActivity.this)
         .show();
 ```
 
-* Kotlin 用法
+* Kotlin 用法（二选一）
+
+```kotlin
+XToast<XToast<*>>(activity).apply {
+    setView(R.layout.toast_hint)
+    // 设置成可拖拽的
+    //setDraggable()
+    // 设置显示时长
+    setDuration(1000)
+    // 设置动画样式
+    //setAnimStyle(android.R.style.Animation_Translucent)
+    // 设置外层是否能被触摸
+    //setOutsideTouchable(false)
+    // 设置窗口背景阴影强度
+    //setBackgroundDimAmount(0.5f)
+    setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
+    setText(android.R.id.message, "点我消失")
+    setOnClickListener(android.R.id.message, XToast.OnClickListener<TextView?> { toast: XToast<*>, view: TextView? ->
+        // 点击这个 View 后消失
+        toast.cancel()
+        // 跳转到某个Activity
+        // toast.startActivity(intent);
+    })
+}.show()
+```
 
 ```kotlin
 XToast<XToast<*>>(activity)
@@ -70,13 +94,11 @@ XToast<XToast<*>>(activity)
         //.setBackgroundDimAmount(0.5f)
         .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
         .setText(android.R.id.message, "点我消失")
-        .setOnClickListener(android.R.id.message, object : OnClickListener<TextView?> {
-            override fun onClick(toast: XToast<XToast<*>>, view: TextView?) {
-                // 点击这个 View 后消失
-                toast.cancel()
-                // 跳转到某个Activity
-                // toast.startActivity(intent);
-            }
+        .setOnClickListener(android.R.id.message, XToast.OnClickListener<TextView?> { toast: XToast<*>, view: TextView? ->
+            // 点击这个 View 后消失
+            toast.cancel()
+            // 跳转到某个Activity
+            // toast.startActivity(intent);
         })
         .show()
 ```
@@ -155,12 +177,12 @@ public final class FloatingLifecycle implements Application.ActivityLifecycleCal
 
 * 日志查看框架：[Logcat](https://github.com/getActivity/Logcat)
 
-#### Android技术讨论Q群：78797078
-
 #### 微信公众号：Android轮子哥
 
 ![](https://raw.githubusercontent.com/getActivity/Donate/master/picture/official_ccount.png)
 
+#### Android 技术分享 QQ 群：78797078
+
 #### 如果您觉得我的开源库帮你节省了大量的开发时间，请扫描下方的二维码随意打赏，要是能打赏个 10.24 :monkey_face:就太:thumbsup:了。您的支持将鼓励我继续创作:octocat:
 
 ![](https://raw.githubusercontent.com/getActivity/Donate/master/picture/pay_ali.png) ![](https://raw.githubusercontent.com/getActivity/Donate/master/picture/pay_wechat.png)

diff --git a/XToast.apk b/XToast.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "com.hjq.xtoast.demo"
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 66
-        versionName "6.6"
+        versionCode 68
+        versionName "6.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -35,11 +35,12 @@ dependencies {
     implementation 'com.google.android.material:material:1.2.1'
 
     // 权限请求框架：https://github.com/getActivity/XXPermissions
-    implementation 'com.hjq:xxpermissions:9.8'
+    implementation 'com.hjq:xxpermissions:10.5'
     // 标题栏框架：https://github.com/getActivity/TitleBar
-    implementation 'com.hjq:titlebar:8.2'
+    implementation 'com.hjq:titlebar:8.5'
     // 吐司工具类：https://github.com/getActivity/ToastUtils
     implementation 'com.hjq:toast:8.8'
     // 内存泄漏捕捉：https://github.com/square/leakcanary
+    // noinspection GradleDependency
     debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.5'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,8 +14,7 @@
         <activity
             android:name=".MainActivity"
             android:configChanges="orientation|screenSize|keyboardHidden"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait">
+            android:launchMode="singleTop">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

diff --git a/app/src/main/java/com/hjq/xtoast/demo/AppApplication.java b/app/src/main/java/com/hjq/xtoast/demo/AppApplication.java
@@ -10,7 +10,7 @@
  *    time   : 2021/01/24
  *    desc   : 应用入口
  */
-public class AppApplication extends Application {
+public final class AppApplication extends Application {
 
     @Override
     public void onCreate() {

diff --git a/app/src/main/java/com/hjq/xtoast/demo/IOSToast.java b/app/src/main/java/com/hjq/xtoast/demo/IOSToast.java
@@ -10,7 +10,7 @@
  *    time   : 2019/01/04
  *    desc   : 仿 IOS 弹框
  */
-public class IOSToast {
+public final class IOSToast {
 
     private static final int TIME = 3000;
 

diff --git a/app/src/main/java/com/hjq/xtoast/demo/MainActivity.java b/app/src/main/java/com/hjq/xtoast/demo/MainActivity.java
@@ -13,8 +13,6 @@
 import com.hjq.permissions.Permission;
 import com.hjq.permissions.XXPermissions;
 import com.hjq.toast.ToastUtils;
-import com.hjq.xtoast.OnClickListener;
-import com.hjq.xtoast.OnToastListener;
 import com.hjq.xtoast.XToast;
 import com.hjq.xtoast.draggable.MovingDraggable;
 import com.hjq.xtoast.draggable.SpringDraggable;
@@ -27,7 +25,7 @@
  *    time   : 2019/01/04
  *    desc   : Demo 使用案例
  */
-public class MainActivity extends AppCompatActivity {
+public final class MainActivity extends AppCompatActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -62,7 +60,7 @@ public void show3(View v) {
                 .setAnimStyle(android.R.style.Animation_Dialog)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_warning)
                 .setText(android.R.id.message, "是不是感觉很牛逼")
-                .setOnToastListener(new OnToastListener() {
+                .setOnToastListener(new XToast.OnToastListener() {
 
                     @Override
                     public void onShow(XToast<?> toast) {
@@ -83,7 +81,7 @@ public void show4(View v) {
                 .setAnimStyle(android.R.style.Animation_Translucent)
                 .setImageDrawable(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
                 .setText(android.R.id.message, "点我点我点我")
-                .setOnClickListener(android.R.id.message, new OnClickListener<TextView>() {
+                .setOnClickListener(android.R.id.message, new XToast.OnClickListener<TextView>() {
 
                     @Override
                     public void onClick(final XToast<?> toast, TextView view) {
@@ -111,7 +109,7 @@ public void show5(View v) {
                 .setBackgroundDimAmount(0.5f)
                 // 设置成可拖拽的
                 .setDraggable(new MovingDraggable())
-                .setOnClickListener(android.R.id.message, new OnClickListener<TextView>() {
+                .setOnClickListener(android.R.id.message, new XToast.OnClickListener<TextView>() {
 
                     @Override
                     public void onClick(XToast<?> toast, TextView view) {
@@ -135,7 +133,7 @@ public void onGranted(List<String> granted, boolean all) {
                                 .setYOffset(200)
                                 // 设置指定的拖拽规则
                                 .setDraggable(new SpringDraggable())
-                                .setOnClickListener(android.R.id.icon, new OnClickListener<ImageView>() {
+                                .setOnClickListener(android.R.id.icon, new XToast.OnClickListener<ImageView>() {
 
                                     @Override
                                     public void onClick(XToast<?> toast, ImageView view) {

diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -8,6 +8,8 @@
         <item name="colorAccent">@color/colorAccent</item>
         <!-- 解决 Android 5.1 及以上版本 Button 英文字符串自动变大写的问题 -->
         <item name="android:textAllCaps">false</item>
+        <!-- 设置窗口全屏 -->
+<!--        <item name="android:windowFullscreen">true</item>-->
     </style>
 
 </resources>
diff --git a/library/build.gradle b/library/build.gradle
@@ -6,16 +6,16 @@ android {
 
     defaultConfig {
         minSdkVersion 14
-        versionCode 66
-        versionName "6.6"
+        versionCode 68
+        versionName "6.8"
     }
 }
 
 publish {
     userOrg = 'getactivity'
     groupId = 'com.hjq'
     artifactId = 'xtoast'
-    publishVersion = '6.6'
+    publishVersion = '6.8'
     desc = 'This is a simple and easy to use suspension window frame'
     website = "https://github.com/getActivity/XToast"
 }

diff --git a/library/src/main/java/com/hjq/xtoast/OnClickListener.java b/library/src/main/java/com/hjq/xtoast/OnClickListener.java
diff --git a/library/src/main/java/com/hjq/xtoast/OnToastListener.java b/library/src/main/java/com/hjq/xtoast/OnToastListener.java
diff --git a/library/src/main/java/com/hjq/xtoast/OnTouchListener.java b/library/src/main/java/com/hjq/xtoast/OnTouchListener.java
diff --git a/library/src/main/java/com/hjq/xtoast/ViewClickWrapper.java b/library/src/main/java/com/hjq/xtoast/ViewClickWrapper.java
@@ -12,9 +12,9 @@
 final class ViewClickWrapper implements View.OnClickListener {
 
     private final XToast<?> mToast;
-    private final OnClickListener mListener;
+    private final XToast.OnClickListener mListener;
 
-    ViewClickWrapper(XToast<?> toast, View view, OnClickListener listener) {
+    ViewClickWrapper(XToast<?> toast, View view, XToast.OnClickListener listener) {
         mToast = toast;
         mListener = listener;
 

diff --git a/library/src/main/java/com/hjq/xtoast/ViewTouchWrapper.java b/library/src/main/java/com/hjq/xtoast/ViewTouchWrapper.java
@@ -14,9 +14,9 @@
 final class ViewTouchWrapper implements View.OnTouchListener {
 
     private final XToast<?> mToast;
-    private final OnTouchListener mListener;
+    private final XToast.OnTouchListener mListener;
 
-    ViewTouchWrapper(XToast<?> toast, View view, OnTouchListener listener) {
+    ViewTouchWrapper(XToast<?> toast, View view, XToast.OnTouchListener listener) {
         mToast = toast;
         mListener = listener;