Merge pull request #33 from TorryDo/release/v0.5.3

Release/v0.5.3
TorryDo · Apr 29, 2023 · cbf4485 · cbf4485
2 parents bc01c9c + f918a6d
commit cbf4485
Show file tree

Hide file tree

Showing 15 changed files with 324 additions and 201 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/ExpandableView.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/ExpandableView.kt
@@ -96,7 +96,6 @@ class ExpandableView(
             gravity = Gravity.TOP
             flags = WindowManager.LayoutParams.FLAG_DIM_BEHIND
             dimAmount = builder.dim         // default = 0.5f
-            softInputMode = WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE
 
             builder.viewStyle?.let {
                 windowAnimations = it

diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/FloatingBubble.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/FloatingBubble.kt
@@ -20,12 +20,7 @@ internal constructor(
     private var bottomBackground: FloatingBottomBackground? = null
 
     init {
-        ScreenInfo.getScreenSize(builder.context).also {
-            ScreenInfo.widthPx = it.width
-            ScreenInfo.heightPx = it.height
-        }
-        ScreenInfo.statusBarHeightPx = ScreenInfo.getStatusBarHeight(builder.context)
-        ScreenInfo.softNavBarHeightPx = ScreenInfo.getSoftNavigationBarSize(builder.context)
+        ScreenInfo.onOrientationChanged(builder.context)
 
         bubbleView = FloatingBubbleView(
             builder.addFloatingBubbleListener(CustomBubbleListener())
@@ -78,7 +73,7 @@ internal constructor(
         fun requestStop()
     }
 
-    // internal func ---------------------------------------------------------------------------------
+    //region public methods ------------------------------------------------------------------------
 
     internal fun showIcon() {
         bubbleView.show()
@@ -98,7 +93,9 @@ internal constructor(
         bottomBackground?.remove()
     }
 
-    // private func --------------------------------------------------------------------------------
+    //endregion
+
+    //region Private func --------------------------------------------------------------------------
 
     private inner class CustomBubbleListener : Listener {
 
@@ -108,7 +105,7 @@ internal constructor(
         override fun onMove(x: Float, y: Float) {
             when (builder.behavior) {
                 BubbleBehavior.DYNAMIC_CLOSE_BUBBLE -> {
-                    bubbleView.updateLocation(x, y)
+                    bubbleView.updateLocationUI(x, y)
                     val (bubbleX, bubbleY) = bubbleView.rawLocationOnScreen()
                     closeBubbleView?.animateCloseIconByBubble(bubbleX.toInt(), bubbleY.toInt())
                 }
@@ -130,7 +127,7 @@ internal constructor(
 
                     } else {
                         isBubbleAnimated = false
-                        bubbleView.updateLocation(x, y)
+                        bubbleView.updateLocationUI(x, y)
                     }
                 }
             }
@@ -180,7 +177,9 @@ internal constructor(
         ) == 0.0f
     }
 
-    // builder -------------------------------------------------------------------------------------
+    //endregion
+
+    //region Builder -------------------------------------------------------------------------------
 
     class Builder(internal val context: Context) {
 
@@ -420,4 +419,6 @@ internal constructor(
         }
     }
 
+    //endregion
+
 }