将 EasyWindow 更新到最新版本

Author: getActivity

library/build.gradle

@@ -32,7 +32,7 @@ dependencies {
     // noinspection GradleCompatible
     implementation 'com.android.support:design:26.0.0'
     // 悬浮窗框架：https://github.com/getActivity/EasyWindow
-    implementation 'com.github.getActivity:EasyWindow:10.6'
+    implementation 'com.github.getActivity:EasyWindow:12.0'
 }
 
 tasks.withType(Javadoc).configureEach {

library/src/main/java/com/hjq/logcat/ChooseWindow.java

@@ -2,12 +2,14 @@
 
 import android.app.Activity;
 import android.os.Build;
+import android.support.annotation.NonNull;
 import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.AdapterView;
 import android.widget.ListView;
 import com.hjq.window.EasyWindow;
+import com.hjq.window.OnWindowViewClickListener;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -19,7 +21,7 @@
  *    desc   : 列表选择类
  */
 final class ChooseWindow extends EasyWindow<ChooseWindow> implements
-        AdapterView.OnItemClickListener, EasyWindow.OnClickListener<View> {
+        AdapterView.OnItemClickListener, OnWindowViewClickListener<View> {
 
     private final ChooseAdapter mAdapter;
     private OnListener mListener;
@@ -39,11 +41,11 @@ final class ChooseWindow extends EasyWindow<ChooseWindow> implements
         listView.setAdapter(mAdapter);
         listView.setOnItemClickListener(this);
 
-        setOnClickListener(R.id.fl_choose_root, this);
+        setOnClickListenerByView(R.id.fl_choose_root, this);
     }
 
     @Override
-    public void onClick(EasyWindow window, View view) {
+    public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull View view) {
         cancel();
     }
 

library/src/main/java/com/hjq/logcat/LogcatUtils.java

@@ -120,10 +120,10 @@ static void toast(Activity activity, int stringId) {
     static void toast(Activity activity, CharSequence text) {
         EasyWindow.with(activity)
                 .setContentView(R.layout.logcat_window_toast)
-                .setDuration(3000)
+                .setWindowDuration(3000)
                 .setGravity(Gravity.CENTER)
                 .setAnimStyle(android.R.style.Animation_Toast)
-                .setText(android.R.id.message, text)
+                .setTextByTextView(android.R.id.message, text)
                 .show();
     }
 

library/src/main/java/com/hjq/logcat/LogcatWindow.java

@@ -4,20 +4,22 @@
 import android.app.Application;
 import android.content.Context;
 import android.content.Intent;
+import android.support.annotation.NonNull;
 import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.ImageView;
 import com.hjq.window.EasyWindow;
-import com.hjq.window.draggable.SpringBackDraggable;
+import com.hjq.window.OnWindowViewClickListener;
+import com.hjq.window.draggable.SpringBackWindowDraggableRule;
 
 /**
  *    author : Android 轮子哥
  *    github : https://github.com/getActivity/Logcat
  *    time   : 2020/01/24
  *    desc   : 悬浮窗口
  */
-final class LogcatWindow extends EasyWindow<LogcatWindow> implements EasyWindow.OnClickListener<View> {
+final class LogcatWindow extends EasyWindow<LogcatWindow> implements OnWindowViewClickListener<View> {
 
     public LogcatWindow(Application application) {
         super(application);
@@ -40,13 +42,13 @@ private void init(Context context) {
         setHeight(size);
 
         setAnimStyle(android.R.style.Animation_Toast);
-        setDraggable(new SpringBackDraggable());
+        setWindowDraggableRule(new SpringBackWindowDraggableRule());
         setGravity(Gravity.END | Gravity.CENTER_VERTICAL);
-        setOnClickListener(android.R.id.icon, this);
+        setOnClickListenerByView(android.R.id.icon, this);
     }
 
     @Override
-    public void onClick(EasyWindow window, View view) {
+    public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull View view) {
         Context context = getContext();
         Intent intent = new Intent(context, LogcatActivity.class);
         if (!(context instanceof Activity)) {