cleanup, fix expanded-bubble size issue

dofire · Sep 21, 2023 · 22ce0e5 · 22ce0e5
1 parent 14b6fb6
commit 22ce0e5
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 102 deletions.
diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/MyBubbleLayout.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/MyBubbleLayout.kt
@@ -2,6 +2,7 @@ package com.torrydo.floatingbubbleview
 
 import android.content.Context
 import android.util.AttributeSet
+import android.view.KeyEvent
 import android.view.MotionEvent
 import android.widget.LinearLayout
 
@@ -16,6 +17,19 @@ internal open class MyBubbleLayout(
     internal var ignoreChildEvent: (MotionEvent) -> Boolean = { false }
     internal var doOnTouchEvent: (MotionEvent) -> Unit = {}
 
+    private var onDispatchKeyEvent: ((KeyEvent) -> Boolean?)? = null
+
+    fun setOnDispatchKeyEvent(callback: ((KeyEvent) -> Boolean?)){
+        onDispatchKeyEvent = callback
+    }
+
+    override fun dispatchKeyEvent(event: KeyEvent?): Boolean {
+        if (onDispatchKeyEvent != null && event != null) {
+            return onDispatchKeyEvent!!(event) ?: super.dispatchKeyEvent(event)
+        }
+        return super.dispatchKeyEvent(event)
+    }
+
     override fun onInterceptTouchEvent(ev: MotionEvent?): Boolean {
         val b = ev?.let{
             doOnTouchEvent(it)

diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/MyFloatingComposeView.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/MyFloatingComposeView.kt
diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/bubble/FloatingBubble.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/bubble/FloatingBubble.kt
@@ -4,9 +4,7 @@ import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Point
 import android.graphics.PointF
-import android.util.Log
 import android.view.*
-import android.widget.FrameLayout
 import androidx.dynamicanimation.animation.SpringAnimation
 import androidx.dynamicanimation.animation.SpringForce
 import com.torrydo.floatingbubbleview.AnimHelper
@@ -28,12 +26,9 @@ class FloatingBubble(
     onDispatchKeyEvent: ((KeyEvent) -> Boolean?)? = null
 ) : Bubble(
     context = context,
-    root = object : MyBubbleLayout(context) {
-        override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-            if(onDispatchKeyEvent != null){
-                return onDispatchKeyEvent(event) ?: super.dispatchKeyEvent(event)
-            }
-            return super.dispatchKeyEvent(event)
+    root = LayoutInflater.from(context).inflate(R.layout.bubble, null).apply {
+        if (onDispatchKeyEvent != null) {
+            (this as MyBubbleLayout).setOnDispatchKeyEvent(onDispatchKeyEvent)
         }
     },
     containCompose = containCompose
@@ -154,33 +149,23 @@ class FloatingBubble(
             endY = y,
             event = object : AnimHelper.Event {
                 override fun onUpdatePoint(x: Float, y: Float) {
-
                     layoutParams.x = x.toInt()
                     layoutParams.y = y.toInt()
 
 //                    builder.listener?.onMove(x.toFloat(), y.toFloat()) // don't call this line, it'll spam multiple MotionEvent.OnActionMove
                     update()
-
                 }
             },
             stiffness = stiffness,
         )
     }
 
-    private fun getX() = context.resources.configuration.smallestScreenWidthDp
-
-    //    private val MAX_XY_MOVE = 80f
+    private val MAX_XY_MOVE = 1f
     private var ignoreClick: Boolean = false
 
     @SuppressLint("ClickableViewAccessibility")
     private fun customTouch() {
 
-        val dpi = getX()
-        val max_xy_move = dpi / 22
-//        Log.d("<>", "dpi | xy: ${dpi} - ${max_xy_move}");
-//        Log.d("<>", "sdfasfasdf ${context.resources.configuration}: ");
-
-
         fun handleMovement(event: MotionEvent) {
             when (event.action) {
                 MotionEvent.ACTION_DOWN -> {
@@ -220,7 +205,9 @@ class FloatingBubble(
                 }
 
                 MotionEvent.ACTION_MOVE -> {
-                    ignoreClick = abs(event.rawX - rawPointOnDown.x) > max_xy_move || abs(event.rawY - rawPointOnDown.y) > max_xy_move
+                    if (abs(event.rawX - rawPointOnDown.x) > MAX_XY_MOVE || abs(event.rawY - rawPointOnDown.y) > MAX_XY_MOVE) {
+                        ignoreClick = true
+                    }
                 }
             }
 

diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/helper/ComposeHelper.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/helper/ComposeHelper.kt
diff --git a/app/src/main/java/com/torrydo/testfloatingbubble/MyServiceKt.kt b/app/src/main/java/com/torrydo/testfloatingbubble/MyServiceKt.kt
@@ -36,12 +36,12 @@ class MyServiceKt : ExpandableBubbleService() {
         return BubbleBuilder(this)
 
             // set bubble view
-//            .bubbleView(imgView)
+            .bubbleView(imgView)
 
             // or our sweetie, Jetpack Compose
-            .bubbleCompose {
-                BubbleCompose(expand = { expand() })
-            }
+//            .bubbleCompose {
+//                BubbleCompose(expand = { expand() })
+//            }
 //            .forceDragging(false)
 
             // set style for the bubble, fade animation by default