Merge pull request #43 from TorryDo/release/v0.6.0

revamp
TorryDo · Sep 11, 2023 · 4316832 · 4316832
2 parents 7f5e060 + 745509b
commit 4316832
Show file tree

Hide file tree

Showing 47 changed files with 1,765 additions and 2,286 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/FloatingBubbleView/build.gradle b/FloatingBubbleView/build.gradle
@@ -33,7 +33,7 @@ android {
         jvmTarget = '1.8'
     }
     buildFeatures {
-        viewBinding true
+//        viewBinding true
         compose true
     }
 
@@ -45,13 +45,15 @@ android {
 
 dependencies {
 
-    implementation("androidx.core:core-ktx:1.6.0")
-    implementation("androidx.appcompat:appcompat:1.4.0")
+    implementation("androidx.core:core-ktx:1.10.1")
+//    implementation("androidx.appcompat:appcompat:1.6.1")
+//    implementation("androidx.lifecycle:lifecycle-service:2.6.1")
 
     implementation("androidx.dynamicanimation:dynamicanimation:1.0.0")
 
-    implementation "androidx.compose.foundation:foundation:1.3.1"
+    implementation("androidx.savedstate:savedstate:1.2.1")
+    implementation("androidx.compose.foundation:foundation:1.5.1")
 
-    implementation "io.github.torrydo:screen-easy:0.1.0"
+    implementation("io.github.torrydo:screen-easy:0.1.0")
 
 }
diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/AnimHelper.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/AnimHelper.kt
@@ -1,7 +1,5 @@
 package com.torrydo.floatingbubbleview
 
-import androidx.annotation.Discouraged
-import androidx.dynamicanimation.animation.FlingAnimation
 import androidx.dynamicanimation.animation.FloatValueHolder
 import androidx.dynamicanimation.animation.SpringAnimation
 import androidx.dynamicanimation.animation.SpringForce
@@ -33,7 +31,7 @@ internal object AnimHelper {
         event: Event,
         stiffness: Float = SpringForce.STIFFNESS_LOW,
         dampingRatio: Float = SpringForce.DAMPING_RATIO_LOW_BOUNCY,
-    ) {
+    ): SpringAnimation {
         val springAnim = SpringAnimation(FloatValueHolder())
 
         springAnim.spring = SpringForce().apply {
@@ -53,6 +51,8 @@ internal object AnimHelper {
 
         event.onStart()
         springAnim.start()
+
+        return springAnim
     }
 
 
@@ -64,7 +64,7 @@ internal object AnimHelper {
         event: Event,
         stiffness: Float = SpringForce.STIFFNESS_MEDIUM,
         dampingRatio: Float = SpringForce.DAMPING_RATIO_MEDIUM_BOUNCY
-    ) {
+    ): SpringAnimation {
         val xDistance = endX - startX
         val yDistance = endY - startY
 
@@ -75,7 +75,7 @@ internal object AnimHelper {
             this.dampingRatio = dampingRatio
         }
 
-        if(yDistance>xDistance) {
+        if (yDistance > xDistance) {
             springAnim.setStartValue(startY)
             springForce.finalPosition = endY
 
@@ -86,12 +86,12 @@ internal object AnimHelper {
                     y = value
                 )
             }
-        }else{
+        } else {
             springAnim.setStartValue(startX)
             springForce.finalPosition = endX
 
             springAnim.addUpdateListener { animation, value, velocity ->
-                val ratio = (value-startX) / xDistance
+                val ratio = (value - startX) / xDistance
                 event.onUpdatePoint(
                     x = value,
                     y = startY + yDistance * ratio
@@ -106,30 +106,8 @@ internal object AnimHelper {
 
         event.onStart()
         springAnim.start()
-    }
-
-    @Discouraged("not finished yet")
-    fun startFlingX(
-        startVelocity: Float = 50f,
-        startValue: Float,
-        minValue: Float,
-        maxValue: Float,
-        friction: Float = DEFAULT_FRICTION,
-        animationListener: Event
-    ) {
-        FlingAnimation(FloatValueHolder()).apply {
-            setStartValue(startValue)
-            setStartVelocity(startVelocity)
-            setMinValue(minValue)
-            setMaxValue(maxValue)
-            setFriction(friction)
-
-            addUpdateListener { animation, value, velocity ->
-                animationListener.onUpdate(value)
-            }
 
-            start()
-        }
+        return springAnim
     }
 
 }
diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/BaseFloatingView.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/BaseFloatingView.kt
diff --git a/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/BaseFloatingViewBinding.kt b/FloatingBubbleView/src/main/java/com/torrydo/floatingbubbleview/BaseFloatingViewBinding.kt
diff --git a/...rydo/floatingbubbleview/BubbleBehavior.kt → ...floatingbubbleview/CloseBubbleBehavior.kt b/...rydo/floatingbubbleview/BubbleBehavior.kt → ...floatingbubbleview/CloseBubbleBehavior.kt
@@ -1,6 +1,6 @@
 package com.torrydo.floatingbubbleview
 
-enum class BubbleBehavior {
+enum class CloseBubbleBehavior {
     DYNAMIC_CLOSE_BUBBLE,
     FIXED_CLOSE_BUBBLE
 }