Merge pull request #32 from recruit-lifestyle/2.2

2.2

Author: YoshihideSogawa

README.md

@@ -12,7 +12,7 @@ To API Level 14 or later are supported
 [SimpleFloating](http://youtu.be/nb8M2p0agF4)
 
 ## Requirements
-Target Sdk Version : 25
+Target Sdk Version : 25  
 Min Sdk Version : 14  
 
 ## How to use
@@ -25,7 +25,7 @@ Min Sdk Version : 14
   }
 
   dependencies {
-    compile 'com.github.recruit-lifestyle:FloatingView:2.1'
+    compile 'com.github.recruit-lifestyle:FloatingView:2.2'
   }
   ```
 
@@ -53,9 +53,9 @@ public class ChatHeadService extends Service {
   mFloatingViewManager.addViewToWindow(iconView, options);
 ```  
 
-The second argument of FloatingViewManager is FloatingViewListener
+The second argument of `FloatingViewManager` is `FloatingViewListener`
 
-Describe the process (onFinishFloatingView) that is called when you exit the FloatingView
+Describe the process (`onFinishFloatingView`) that is called when you exit the FloatingView
 ```java
     @Override
     public void onFinishFloatingView() {
@@ -87,18 +87,61 @@ example)
     activity.startService(new Intent(activity, ChatHeadService.class));
 ```
 
+## Static Options
+It can be set only when displaying for the first time
+  
+example)
+```java
+final FloatingViewManager.Options options = new FloatingViewManager.Options();
+options.overMargin = (int) (16 * metrics.density);
+mFloatingViewManager.addViewToWindow(iconView, options);
+```
+
+|Option|Description|  
+|:-:|---|  
+|shape|`FloatingViewManager.SHAPE_CIRCLE`:Cicle(default)<br> `FloatingViewManager.SHAPE_RECTANGLE`:Rectangle|  
+|overMargin|Margin over the edge of the screen (px)<br>(default) 0|  
+|floatingViewX|X coordinate of initial display<br>(default) left side of display|  
+|floatingViewY|Y coordinate of initial display<br>(default) top of display|  
+|floatingViewWidth|FloatingView width<br>(default) The width of the layout added to FloatingView |  
+|floatingViewHeight|FloatingView height<br>(default) The height of the layout added to FloatingView|  
+|moveDirection|`FloatingViewManager.MOVE_DIRECTION_DEFAULT`:Left end or right end(default)<br> `FloatingViewManager.MOVE_DIRECTION_LEFT`:Left end<br>`FloatingViewManager.MOVE_DIRECTION_RIGHT`:Right end<br>`FloatingViewManager.MOVE_DIRECTION_NONE`:Not move|  
+|animateInitialMove|If true, animation when first displayed<br>(FloatingViewX, floatingViewY) to screen edge<br>Info: If `MOVE_DIRECTION_NONE` is set, nothing happens|  
+
+## Dynamic Options
+It can be set any time  
+  
+exapmle)
+```java
+mFloatingViewManager.setFixedTrashIconImage(R.drawable.ic_trash_fixed);
+mFloatingViewManager.setActionTrashIconImage(R.drawable.ic_trash_action);
+```
+
+|Option|Description|
+|:-:|---|
+|setFixedTrashIconImage|It is an icon that does *not* enlarge when FloatingView overlaps.|
+|setActionTrashIconImage|It is an icon that enlarge when FloatingView overlaps.|
+|setDisplayMode|`FloatingViewManager.DISPLAY_MODE_SHOW_ALWAYS`:Always show<br>`FloatingViewManager.DISPLAY_MODE_HIDE_ALWAYS`:Always hidden<br>`FloatingViewManager.DISPLAY_MODE_HIDE_FULLSCREEN`:It is hidden when in full screen|
+|setTrashViewEnabled|If false, the trash icon does not show during dragging.<br>(default) true|
+
+# Revisions
+## Update in 2.2
+- Support for large image for FloatingView (not complete, but almost works)([#16](../../issues/16))
+- Support size specification of FloatingView([#16](../../issues/16))
+- Fix issue [#14](../../issues/14)
+
 ## Update in 2.1
 - Add `FloatingViewListener#onTouchFinished`.This method is called when the touch action is finished.
 
 
-## Credits
+# Credits
 
 FloatingView is owned and maintained by [RECRUIT LIFESTYLE CO., LTD.](http://www.recruit-lifestyle.co.jp/)
 
 FloatingView was originally created by [Yoshihide Sogawa](https://twitter.com/egg_sogawa)  
 
 
-## License
+# License
 
     Copyright 2015 RECRUIT LIFESTYLE CO., LTD.
 

library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingView.java

@@ -1,12 +1,12 @@
 /**
  * Copyright 2015 RECRUIT LIFESTYLE CO., LTD.
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *            http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -31,6 +31,8 @@
 import android.support.annotation.NonNull;
 import android.util.DisplayMetrics;
 import android.view.Gravity;
+import android.view.KeyCharacterMap;
+import android.view.KeyEvent;
 import android.view.MotionEvent;
 import android.view.View;
 import android.view.ViewConfiguration;
@@ -114,6 +116,16 @@ class FloatingView extends FrameLayout implements ViewTreeObserver.OnPreDrawList
      */
     static final int DEFAULT_Y = Integer.MIN_VALUE;
 
+    /**
+     * Default width size
+     */
+    static final int DEFAULT_WIDTH = ViewGroup.LayoutParams.WRAP_CONTENT;
+
+    /**
+     * Default height size
+     */
+    static final int DEFAULT_HEIGHT = ViewGroup.LayoutParams.WRAP_CONTENT;
+
     /**
      * WindowManager
      */
@@ -180,7 +192,34 @@ class FloatingView extends FrameLayout implements ViewTreeObserver.OnPreDrawList
     /**
      * ステータスバーの高さ
      */
-    private final int mStatusBarHeight;
+    private final int mBaseStatusBarHeight;
+
+    /**
+     * Current status bar's height
+     */
+    private int mStatusBarHeight;
+
+    /**
+     * Navigation bar's height(portlait)
+     */
+    private final int mBaseNavigationBarHeight;
+
+    /**
+     * Navigation bar's height
+     * Placed bottom on the screen(tablet)
+     * Or placed vertically on the screen(phone)
+     */
+    private final int mBaseNavigationBarRotatedHeight;
+
+    /**
+     * Current Navigation bar's vertical size
+     */
+    private int mNavigationBarVerticalOffset;
+
+    /**
+     * Current Navigation bar's horizontal size
+     */
+    private int mNavigationBarHorizontalOffset;
 
     /**
      * 左・右端に寄せるアニメーション
@@ -242,6 +281,11 @@ class FloatingView extends FrameLayout implements ViewTreeObserver.OnPreDrawList
      */
     private int mMoveDirection;
 
+    /**
+     * If true, it's a tablet. If false, it's a phone
+     */
+    private final boolean mIsTablet;
+
     /**
      * コンストラクタ
      *
@@ -266,30 +310,57 @@ class FloatingView extends FrameLayout implements ViewTreeObserver.OnPreDrawList
         mLongPressHandler = new LongPressHandler(this);
         mMoveEdgeInterpolator = new OvershootInterpolator(MOVE_TO_EDGE_OVERSHOOT_TENSION);
         mMoveDirection = FloatingViewManager.MOVE_DIRECTION_DEFAULT;
+        final Resources resources = context.getResources();
+        mIsTablet = (resources.getConfiguration().screenLayout & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_LARGE;
 
         mMoveLimitRect = new Rect();
         mPositionLimitRect = new Rect();
 
         // ステータスバーの高さを取得
-        final Resources resources = context.getResources();
-        final int statusBarHeightId = resources.getIdentifier("status_bar_height", "dimen", "android");
-        if (statusBarHeightId > 0) {
-            mStatusBarHeight = resources.getDimensionPixelSize(statusBarHeightId);
+        mBaseStatusBarHeight = getSystemUiDimensionPixelSize(resources, "status_bar_height");
+        mStatusBarHeight = mBaseStatusBarHeight;
+
+        // get navigation bar height
+        final boolean hasMenuKey = ViewConfiguration.get(context).hasPermanentMenuKey();
+        final boolean hasBackKey = KeyCharacterMap.deviceHasKey(KeyEvent.KEYCODE_BACK);
+        if (hasMenuKey || hasBackKey) {
+            mBaseNavigationBarHeight = 0;
+            mBaseNavigationBarRotatedHeight = 0;
         } else {
-            mStatusBarHeight = 0;
+            mBaseNavigationBarHeight = getSystemUiDimensionPixelSize(resources, "navigation_bar_height");
+            final String resName = mIsTablet ? "navigation_bar_height_landscape" : "navigation_bar_width";
+            mBaseNavigationBarRotatedHeight = getSystemUiDimensionPixelSize(resources, resName);
         }
 
         // 初回描画処理用
         getViewTreeObserver().addOnPreDrawListener(this);
     }
 
+    /**
+     * Get the System ui dimension(pixel)
+     *
+     * @param resources {@link Resources}
+     * @param resName   dimension resource name
+     * @return pixel size
+     */
+    private static int getSystemUiDimensionPixelSize(Resources resources, String resName) {
+        int pixelSize = 0;
+        final int resId = resources.getIdentifier(resName, "dimen", "android");
+        if (resId > 0) {
+            pixelSize = resources.getDimensionPixelSize(resId);
+        }
+        return pixelSize;
+    }
+
+
     /**
      * 表示位置を決定します。
      */
     @Override
     protected void onSizeChanged(int w, int h, int oldw, int oldh) {
         super.onSizeChanged(w, h, oldw, oldh);
-        updateViewLayout();
+        final boolean isSizeChanged = w != oldw || h != oldh;
+        updateViewLayout(isSizeChanged);
     }
 
     /**
@@ -298,7 +369,7 @@ protected void onSizeChanged(int w, int h, int oldw, int oldh) {
     @Override
     protected void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        updateViewLayout();
+        updateViewLayout(false);
     }
 
     /**
@@ -332,10 +403,58 @@ public boolean onPreDraw() {
         return true;
     }
 
+    /**
+     * Called when the layout of the system has changed.
+     *
+     * @param isHideStatusBar     If true, the status bar is hidden
+     * @param isHideNavigationBar If true, the navigation bar is hidden
+     * @param isPortrait          If true, the device orientation is portrait
+     */
+    void onUpdateSystemLayout(boolean isHideStatusBar, boolean isHideNavigationBar, boolean isPortrait) {
+        // status bar
+        mStatusBarHeight = isHideStatusBar ? 0 : mBaseStatusBarHeight;
+        // navigation bar
+        updateNavigationBarOffset(isHideNavigationBar, isPortrait);
+        updateViewLayout(true);
+    }
+
+    /**
+     * Update offset of NavigationBar.
+     *
+     * @param isHideNavigationBar If true, the navigation bar is hidden
+     * @param isPortrait          If true, the device orientation is portrait
+     */
+    private void updateNavigationBarOffset(boolean isHideNavigationBar, boolean isPortrait) {
+        if (!isHideNavigationBar) {
+            mNavigationBarVerticalOffset = 0;
+            mNavigationBarHorizontalOffset = 0;
+            return;
+        }
+
+        // If the portrait, is displayed at the bottom of the screen
+        if (isPortrait) {
+            mNavigationBarVerticalOffset = mBaseNavigationBarHeight;
+            mNavigationBarHorizontalOffset = 0;
+            return;
+        }
+
+        // If it is a Tablet, it will appear at the bottom of the screen.
+        // If it is Phone, it will appear on the side of the screen
+        if (mIsTablet) {
+            mNavigationBarVerticalOffset = mBaseNavigationBarRotatedHeight;
+            mNavigationBarHorizontalOffset = 0;
+        } else {
+            mNavigationBarVerticalOffset = 0;
+            mNavigationBarHorizontalOffset = mBaseNavigationBarRotatedHeight;
+        }
+    }
+
     /**
      * 画面サイズから自位置を決定します。
+     *
+     * @param isSizeChanged If true, FloatingView has changed size
      */
-    private void updateViewLayout() {
+    private void updateViewLayout(boolean isSizeChanged) {
         cancelAnimation();
 
         // 前の画面座標を保存
@@ -352,11 +471,11 @@ private void updateViewLayout() {
         final int newScreenHeight = mMetrics.heightPixels;
 
         // 移動範囲の設定
-        mMoveLimitRect.set(-width, -height * 2, newScreenWidth + width, newScreenHeight + height);
-        mPositionLimitRect.set(-mOverMargin, 0, newScreenWidth - width + mOverMargin, newScreenHeight - mStatusBarHeight - height);
+        mMoveLimitRect.set(-width, -height * 2, newScreenWidth + width + mNavigationBarHorizontalOffset, newScreenHeight + height + mNavigationBarVerticalOffset);
+        mPositionLimitRect.set(-mOverMargin, 0, newScreenWidth - width + mOverMargin + mNavigationBarHorizontalOffset, newScreenHeight - mStatusBarHeight - height + mNavigationBarVerticalOffset);
 
-        // 縦横切替の場合
-        if (oldScreenWidth != newScreenWidth || oldScreenHeight != newScreenHeight) {
+        // FloatingView size changed or device rotating
+        if (isSizeChanged || oldScreenWidth != newScreenWidth || oldScreenHeight != newScreenHeight) {
             // 画面端に移動する場合は現在の位置から左右端を設定
             if (mMoveDirection == FloatingViewManager.MOVE_DIRECTION_DEFAULT) {
                 // 右半分にある場合
@@ -758,7 +877,7 @@ private int getXByTouch() {
      * @return FloatingViewのY座標
      */
     private int getYByTouch() {
-        return (int) (mMetrics.heightPixels - (mScreenTouchY - mLocalTouchY + getHeight()));
+        return (int) (mMetrics.heightPixels + mNavigationBarVerticalOffset - (mScreenTouchY - mLocalTouchY + getHeight()));
     }
 
     /**

library/src/main/java/jp/co/recruit_lifestyle/android/floatingview/FloatingViewListener.java

@@ -1,12 +1,12 @@
 /**
  * Copyright 2015 RECRUIT LIFESTYLE CO., LTD.
- *
+ * <p>
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *            http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.