Merge pull request #19 from ltttttttttttt/dev

Fix bug of BasicsProgressBar
ltttttttttttt · Oct 31, 2022 · b46ab2b · b46ab2b
2 parents 87cc716 + b50ed07
commit b46ab2b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/app/src/main/java/com/lt/test_compose/SwipeToDismissActivity.kt b/app/src/main/java/com/lt/test_compose/SwipeToDismissActivity.kt
@@ -16,6 +16,7 @@
 
 package com.lt.test_compose
 
+import android.util.Log
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
@@ -24,6 +25,7 @@ import androidx.compose.material.Text
 import androidx.compose.material.rememberDismissState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
@@ -61,7 +63,11 @@ class SwipeToDismissActivity : BaseComposeActivity() {
     @Composable
     private fun Star() {
         var star by rememberMutableStateOf(value = 0)
-        StarBar(starValue = star, onStarValueChange = { star = it })
+        StarBar(
+            starValue = star,
+            onStarValueChange = { star = it },
+            onTouchUpEvent = remember { { Log.e("lllttt", "star=$star") } },
+        )
     }
 
     @OptIn(ExperimentalFoundationApi::class)

diff --git a/compose_views/src/main/java/com/lt/compose_views/touch_bar/BasicsProgressBar.kt b/compose_views/src/main/java/com/lt/compose_views/touch_bar/BasicsProgressBar.kt
@@ -86,9 +86,11 @@ fun BasicsProgressBar(
                 state,
                 orientation,
                 userEnable,
-                interactionSource = if (onTouchUpEvent == null) null else DragInteractionSource {
-                    if (it is DragInteraction.Stop || it is DragInteraction.Cancel)
-                        onTouchUpEvent()
+                interactionSource = remember(onTouchUpEvent) {
+                    if (onTouchUpEvent == null) null else DragInteractionSource {
+                        if (it is DragInteraction.Stop || it is DragInteraction.Cancel)
+                            onTouchUpEvent()
+                    }
                 })
     ) {
         content()

diff --git a/compose_views/src/main/java/com/lt/compose_views/touch_bar/StarBar.kt b/compose_views/src/main/java/com/lt/compose_views/touch_bar/StarBar.kt
@@ -66,8 +66,8 @@ fun StarBar(
     onStarValueChange: (Int) -> Unit,
     modifier: Modifier = Modifier,
     maxStar: Int = 5,
-    starPainter: Painter = painterResource(id = R.drawable.star),
-    starSelectPainter: Painter = painterResource(id = R.drawable.star_select),
+    starPainter: Painter = painterResource(id = R.drawable.star_bar_star),
+    starSelectPainter: Painter = painterResource(id = R.drawable.star_bar_star_select),
     starSize: Dp = 16.dp,
     margin: Dp = 3.dp,
     orientation: Orientation = Orientation.Horizontal,

diff --git a/...ws/src/main/res/drawable-xxhdpi/star.webp → ...in/res/drawable-xxhdpi/star_bar_star.webp b/...ws/src/main/res/drawable-xxhdpi/star.webp → ...in/res/drawable-xxhdpi/star_bar_star.webp
diff --git a/...main/res/drawable-xxhdpi/star_select.webp → ...drawable-xxhdpi/star_bar_star_select.webp b/...main/res/drawable-xxhdpi/star_select.webp → ...drawable-xxhdpi/star_bar_star_select.webp