新增英文版的文档和 Demo apk

Author: getActivity

README-en.md

@@ -1,3 +1,5 @@
+# [English Doc](README-en.md)
+
 # 悬浮窗框架
 
 * 项目地址：[Github](https://github.com/getActivity/EasyWindow)
@@ -6,9 +8,9 @@
 
 * 可以扫码下载 Demo 进行演示或者测试，如果扫码下载不了的，[点击此处可直接下载](https://github.com/getActivity/EasyWindow/releases/download/13.0/EasyWindow.apk)
 
-![](picture/demo_code.png)
+![](picture/zh/demo_code.png)
 
-![](picture/dynamic_figure.gif)
+![](picture/zh/dynamic_figure.gif)
 
 #### 本框架意在解决一些悬浮窗的需求，如果是普通的 Toast 封装推荐使用 [Toaster](https://github.com/getActivity/Toaster)
 
@@ -91,12 +93,7 @@ EasyWindow.with(this)
 
             @Override
             public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull TextView view) {
-                // 有两种方式取消弹窗：
-                // 1. easyWindow.cancel：顾名思义，取消显示
-                // 2. easyWindow.recycle：在取消显示的基础上，加上了回收
-                // 这两种区别在于，cancel 之后还能 show，但是 recycle 之后不能再 show
-                // 通常情况下，如果你创建的 EasyWindow 对象在 cancel 之后永远不会再显示，取消弹窗建议直接用 recycle 方法，否则用 cancel 方法
-                easyWindow.recycle();
+                easyWindow.cancel();
                 // 跳转到某个Activity
                 // easyWindow.startActivity(intent);
             }
@@ -122,12 +119,7 @@ EasyWindow.with(activity).apply {
     setImageDrawableByImageView(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
     setTextByTextView(android.R.id.message, "点我消失")
     setOnClickListenerByView(android.R.id.message, OnWindowViewClickListener<TextView?> { easyWindow: EasyWindow<*>, view: TextView ->
-        // 有两种方式取消弹窗：
-        // 1. easyWindow.cancel：顾名思义，取消显示
-        // 2. easyWindow.recycle：在取消显示的基础上，加上了回收
-        // 这两种区别在于，cancel 之后还能 show，但是 recycle 之后不能再 show
-        // 通常情况下，如果你创建的 EasyWindow 对象在 cancel 之后永远不会再显示，取消弹窗建议直接用 recycle 方法，否则用 cancel 方法
-        easyWindow.recycle()
+        easyWindow.cancel()
         // 跳转到某个Activity
         // easyWindow.startActivity(intent)
     })
@@ -150,12 +142,7 @@ EasyWindow.with(activity)
         .setImageDrawableByImageView(android.R.id.icon, R.mipmap.ic_dialog_tip_finish)
         .setTextByTextView(android.R.id.message, "点我消失")
         .setOnClickListenerByView(android.R.id.message, OnWindowViewClickListener<TextView?> { easyWindow: EasyWindow<*>, view: TextView ->
-            // 有两种方式取消弹窗：
-            // 1. easyWindow.cancel：顾名思义，取消显示
-            // 2. easyWindow.recycle：在取消显示的基础上，加上了回收
-            // 这两种区别在于，cancel 之后还能 show，但是 recycle 之后不能再 show
-            // 通常情况下，如果你创建的 EasyWindow 对象在 cancel 之后永远不会再显示，取消弹窗建议直接用 recycle 方法，否则用 cancel 方法
-            easyWindow.recycle()
+            easyWindow.cancel()
             // 跳转到某个Activity
             // easyWindow.startActivity(intent)
         })
@@ -184,23 +171,7 @@ public final class WindowLifecycleControl implements Application.ActivityLifecyc
                 .show();
     }
 
-    @Override
-    public void onActivityStarted(Activity activity) {}
-
-    @Override
-    public void onActivityResumed(Activity activity) {}
-
-    @Override
-    public void onActivityPaused(Activity activity) {}
-
-    @Override
-    public void onActivityStopped(Activity activity) {}
-
-    @Override
-    public void onActivitySaveInstanceState(Activity activity, Bundle outState) {}
-
-    @Override
-    public void onActivityDestroyed(Activity activity) {}
+    ......
 }
 ```
 
@@ -438,6 +409,8 @@ EasyWindowManager.getAllWindowInstance();
 
 * 标题栏框架：[TitleBar](https://github.com/getActivity/TitleBar) ![](https://img.shields.io/github/stars/getActivity/TitleBar.svg) ![](https://img.shields.io/github/forks/getActivity/TitleBar.svg)
 
+* 设备兼容框架：[DeviceCompat](https://github.com/getActivity/DeviceCompat) ![](https://img.shields.io/github/stars/getActivity/DeviceCompat.svg) ![](https://img.shields.io/github/forks/getActivity/DeviceCompat.svg)
+
 * ShapeView 框架：[ShapeView](https://github.com/getActivity/ShapeView) ![](https://img.shields.io/github/stars/getActivity/ShapeView.svg) ![](https://img.shields.io/github/forks/getActivity/ShapeView.svg)
 
 * ShapeDrawable 框架：[ShapeDrawable](https://github.com/getActivity/ShapeDrawable) ![](https://img.shields.io/github/stars/getActivity/ShapeDrawable.svg) ![](https://img.shields.io/github/forks/getActivity/ShapeDrawable.svg)

README.md

@@ -71,7 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
         findViewById(R.id.btn_main_draggable).setOnClickListener(this);
         findViewById(R.id.btn_main_global).setOnClickListener(this);
         findViewById(R.id.btn_main_semi_stealth).setOnClickListener(this);
-        findViewById(R.id.btn_main_utils).setOnClickListener(this);
+        findViewById(R.id.btn_main_toaster_example).setOnClickListener(this);
         findViewById(R.id.btn_main_cancel_all).setOnClickListener(this);
 
         TitleBar titleBar = findViewById(R.id.tb_main_bar);
@@ -102,7 +102,7 @@ public void onClick(View v) {
                     .setContentView(R.layout.window_hint)
                     .setWindowAnim(R.style.TopAnimStyle)
                     .setImageDrawableByImageView(android.R.id.icon, R.drawable.ic_dialog_tip_finish)
-                    .setTextByTextView(android.R.id.message, "这个动画是不是很骚")
+                    .setTextByTextView(android.R.id.message, getString(R.string.demo_animation_cool))
                     .show();
 
         } else if (viewId == R.id.btn_main_duration) {
@@ -112,7 +112,7 @@ public void onClick(View v) {
                     .setContentView(R.layout.window_hint)
                     .setWindowAnim(R.style.IOSAnimStyle)
                     .setImageDrawableByImageView(android.R.id.icon, R.drawable.ic_dialog_tip_error)
-                    .setTextByTextView(android.R.id.message, "一秒后自动消失")
+                    .setTextByTextView(android.R.id.message, getString(R.string.demo_auto_dismiss))
                     .show();
 
         } else if (viewId == R.id.btn_main_overlay) {
@@ -121,7 +121,7 @@ public void onClick(View v) {
                     .setContentView(R.layout.window_hint)
                     .setWindowAnim(R.style.IOSAnimStyle)
                     .setImageDrawableByImageView(android.R.id.icon, R.drawable.ic_dialog_tip_finish)
-                    .setTextByTextView(android.R.id.message, "点我消失")
+                    .setTextByTextView(android.R.id.message, getString(R.string.demo_click_to_dismiss))
                     // 设置外层是否能被触摸
                     .setOutsideTouchable(false)
                     // 设置窗口背景阴影强度
@@ -142,17 +142,17 @@ public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull TextView view) {
                     .setContentView(R.layout.window_hint)
                     .setWindowAnim(R.style.IOSAnimStyle)
                     .setImageDrawableByImageView(android.R.id.icon, R.drawable.ic_dialog_tip_warning)
-                    .setTextByTextView(android.R.id.message, "请注意下方 Snackbar")
+                    .setTextByTextView(android.R.id.message, getString(R.string.demo_notice_snackbar))
                     .setOnWindowLifecycleCallback(new OnWindowLifecycleCallback() {
 
                         @Override
                         public void onWindowShow(@NonNull EasyWindow<?> easyWindow) {
-                            Snackbar.make(getWindow().getDecorView(), "显示回调", Snackbar.LENGTH_SHORT).show();
+                            Snackbar.make(getWindow().getDecorView(), getString(R.string.demo_callback_show), Snackbar.LENGTH_SHORT).show();
                         }
 
                         @Override
                         public void onWindowCancel(@NonNull EasyWindow<?> easyWindow) {
-                            Snackbar.make(getWindow().getDecorView(), "消失回调", Snackbar.LENGTH_SHORT).show();
+                            Snackbar.make(getWindow().getDecorView(), getString(R.string.demo_dismiss_callback), Snackbar.LENGTH_SHORT).show();
                         }
                     })
                     .show();
@@ -164,7 +164,7 @@ public void onWindowCancel(@NonNull EasyWindow<?> easyWindow) {
                     .setWindowAnim(R.style.RightAnimStyle)
                     .setImageDrawableByImageView(android.R.id.icon, R.drawable.ic_dialog_tip_finish)
                     .setWindowDuration(2000)
-                    .setTextByTextView(android.R.id.message, "位置算得准不准")
+                    .setTextByTextView(android.R.id.message, getString(R.string.demo_text_position_accuracy))
                     .setOnClickListenerByView(android.R.id.message, new OnWindowViewClickListener<TextView>() {
 
                         @Override
@@ -246,7 +246,7 @@ public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull ImageView view)
 
                     @Override
                     public boolean onLongClick(@NonNull EasyWindow<?> easyWindow, @NonNull View view) {
-                        Toaster.show("关闭按钮被长按了");
+                        Toaster.show(getString(R.string.demo_close_button_long_press));
                         return false;
                     }
                 })
@@ -282,21 +282,21 @@ public void onWindowLayoutInflateFinished(@NonNull EasyWindow<?> easyWindow, @No
 
                         List<String> dataList = new ArrayList<>();
                         for (int i = 1; i <= 20; i++) {
-                            dataList.add("我是条目 " + i);
+                            dataList.add(getString(R.string.demo_item_prefix) + " " + i);
                         }
 
                         DemoAdapter adapter = new DemoAdapter(dataList);
                         adapter.setOnItemClickListener(new OnItemClickListener() {
 
                             @Override
                             public void onItemClick(View itemView, int position) {
-                                Toaster.show("条目 " + (position +  1) + " 被点击了");
+                                Toaster.show(getString(R.string.demo_item_clicked, (position + 1)));
                             }
                         });
                         adapter.setOnItemLongClickListener(new OnItemLongClickListener() {
                             @Override
                             public boolean onItemLongClick(View itemView, int position) {
-                                Toaster.show("条目 " + (position +  1) + " 被长按了");
+                                Toaster.show(getString(R.string.demo_item_long_pressed, (position + 1)));
                                 return false;
                             }
                         });
@@ -370,7 +370,7 @@ public void onDenied(@NonNull List<IPermission> permissions, boolean doNotAskAga
             // 回收当前正在显示的悬浮窗
             EasyWindowManager.recycleAllWindow();
 
-        } else if (viewId == R.id.btn_main_utils) {
+        } else if (viewId == R.id.btn_main_toaster_example) {
 
             EasyWindow.with(this)
                     // 将 Toaster 中的 View 转移给 EasyWindow 来显示
@@ -430,7 +430,7 @@ public void onWindowDraggingStop(@NonNull EasyWindow<?> easyWindow) {
 
                     @Override
                     public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull ImageView view) {
-                        Toaster.show("我被点击了");
+                        Toaster.show(R.string.demo_toast_click);
                         // 点击后跳转到拨打电话界面
                         // Intent intent = new Intent(Intent.ACTION_DIAL);
                         // intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
@@ -443,8 +443,9 @@ public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull ImageView view)
 
                     @Override
                     public boolean onLongClick(@NonNull EasyWindow<?> easyWindow, @NonNull ImageView view) {
-                        Toaster.show("我被长按了");
-                        return false;
+                        Toaster.show(R.string.demo_toast_long_press);
+                        // 这里返回 true 就不会触发点击事件
+                        return true;
                     }
                 })
                 .show();

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

@@ -71,17 +71,9 @@ public void postStayEdgeRunnable() {
         }
 
         if (isLeftShow()) {
-            if (isTopShow()) {
-                hideHalfView(Gravity.TOP);
-            } else {
-                hideHalfView(Gravity.LEFT);
-            }
+            hideHalfView(Gravity.LEFT);
         } else {
-            if (isTopShow()) {
-                hideHalfView(Gravity.TOP);
-            } else {
-                hideHalfView(Gravity.RIGHT);
-            }
+            hideHalfView(Gravity.RIGHT);
         }
     };
 
@@ -110,7 +102,7 @@ private void hideHalfView(int gravity) {
                     WindowManager.LayoutParams windowParams = getWindowParams();
                     windowDraggableRule.updateLocation(windowParams.x - viewWidth / 2f, windowParams.y, true);
                 } else {
-                    int offSet = getWindowViewWidth() / 2; //用小球来做偏移
+                    int offSet = getWindowViewWidth() / 2;
                     clipBounds.set(offSet, 0, viewWidth, viewHeight);
                     // 设置画板偏移
                     windowRootLayout.setTranslationX(-offSet);
@@ -128,15 +120,6 @@ private void hideHalfView(int gravity) {
                 // 设置裁剪区域
                 windowRootLayout.setClipBounds(clipBounds);
                 break;
-            case Gravity.TOP:
-                int offSetHeight = viewHeight / 2;
-                clipBounds.set(0, offSetHeight, viewWidth, viewHeight);
-                // 设置画板偏移
-                windowRootLayout.setTranslationX(0);
-                windowRootLayout.setTranslationY(-offSetHeight);
-                // 设置裁剪区域
-                windowRootLayout.setClipBounds(clipBounds);
-                break;
             default:
                 break;
         }
@@ -154,7 +137,7 @@ private void showFullView() {
             return;
         }
         Rect safeInsetRect = windowDraggableRule.getSafeInsetRect();
-        if (safeInsetRect != null && safeInsetRect.left > 0 && !isTopShow()) {
+        if (safeInsetRect != null && safeInsetRect.left > 0) {
             WindowManager.LayoutParams windowParams = getWindowParams();
             windowDraggableRule.updateLocation(windowParams.x + viewWidth / 2f, windowParams.y, false);
         }
@@ -175,7 +158,7 @@ private boolean isFullShowView() {
             return true;
         }
         Rect safeInsetRect = windowDraggableRule.getSafeInsetRect();
-        if (safeInsetRect != null && safeInsetRect.left > 0 && !isTopShow()) {
+        if (safeInsetRect != null && safeInsetRect.left > 0) {
             if (getWindowParams().x < safeInsetRect.left) {
                 return false;
             }
@@ -197,24 +180,21 @@ private boolean isFullShowView() {
     }
 
     /**
-     * 悬浮球是否靠顶显示
+     * 获取当前屏幕宽度
      */
-    private boolean isTopShow() {
-        WindowManager.LayoutParams windowParams = getWindowParams();
-        if (isLeftShow()) {
-            return windowParams.x > windowParams.y;
-        } else {
-            return getScreenWidth() - windowParams.x - getWindowViewWidth() > windowParams.y;
-        }
-    }
-
     private int getScreenWidth() {
         Context context = getContext();
         if (context == null) {
             return 0;
         }
-        Resources resources = getContext().getResources();
+        Resources resources = context.getResources();
+        if (resources == null) {
+            return 0;
+        }
         DisplayMetrics displayMetrics = resources.getDisplayMetrics();
+        if (displayMetrics == null) {
+            return 0;
+        }
         return displayMetrics.widthPixels;
     }
 
@@ -262,7 +242,7 @@ public void onClick(@NonNull EasyWindow<?> easyWindow, @NonNull View view) {
             postStayEdgeRunnable();
             return;
         }
-        Toaster.show("我被点击了");
+        Toaster.show(R.string.demo_toast_click);
     }
 
     /** {@link OnWindowLifecycleCallback} */