onRatingChanged fun changes

a914-gowtham · May 2, 2021 · 0defd8a · 0defd8a
1 parent f4d6c3f
commit 0defd8a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 22 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/com/gowtham/compose_ratingbar/MainActivity.kt b/app/src/main/java/com/gowtham/compose_ratingbar/MainActivity.kt
@@ -25,6 +25,7 @@ import com.gowtham.compose_ratingbar.MainActivity.Companion.initialRating
 import com.gowtham.compose_ratingbar.ui.theme.ComposeRatingBarTheme
 import com.gowtham.ratingbar.LogMessage
 import com.gowtham.ratingbar.RatingBar
+import com.gowtham.ratingbar.RatingBarStyle
 import com.gowtham.ratingbar.StepSize
 
 class MainActivity : ComponentActivity() {
@@ -60,12 +61,9 @@ fun MainScreen() {
         horizontalAlignment = Alignment.CenterHorizontally,
         verticalArrangement = Arrangement.Center,
     ) {
-        RatingBar(value = rating,onRatingDone = {
-            Log.d("TAG", "onRatingDone: $it")
-        },onRatingChanged = {
+        RatingBar(value = rating,onRatingChanged = {
             rating=it
         })
-        Spacer(modifier = Modifier.requiredSize(4.dp))
     }
 }
 

diff --git a/ratingbar/src/main/java/com/gowtham/ratingbar/RatingBar.kt b/ratingbar/src/main/java/com/gowtham/ratingbar/RatingBar.kt
@@ -1,6 +1,5 @@
 package com.gowtham.ratingbar
 
-import android.util.Log
 import android.view.MotionEvent
 import androidx.compose.foundation.layout.*
 import androidx.compose.material.Surface
@@ -45,8 +44,7 @@ var SemanticsPropertyReceiver.starRating by StarRatingKey
  * @param inactiveColor A [Color] representing a inactive star (or part of it)
  * @param stepSize Minimum value to trigger a change
  * @param ratingBarStyle Can be [RatingBarStyle.Normal] or [RatingBarStyle.HighLighted]
- * @param onRatingDone triggers when the single click or dragging is done and lastRating value is passed in the param
- * @param onRatingChanged A function to be called when the value changes
+ * @param onRatingChanged A function to be called when the click or drag is released and rating value is passed
  */
 @Composable
 fun RatingBar(
@@ -60,16 +58,17 @@ fun RatingBar(
     inactiveColor: Color = Color(0xffffecb3),
     stepSize: StepSize = StepSize.ONE,
     ratingBarStyle: RatingBarStyle = RatingBarStyle.Normal,
-    onRatingDone: (Float) -> Unit,
     onRatingChanged: (Float) -> Unit
 ) {
     var rowSize by remember { mutableStateOf(Size.Zero) }
-    var lastKnownValue=0f
+    var rating by remember { mutableStateOf(value) }
 
     Surface {
         Row(modifier = modifier
             .onSizeChanged { rowSize = it.toSize() }
             .pointerInteropFilter {
+                if(isIndicator)
+                    return@pointerInteropFilter false
                 when (it.action) {
                     MotionEvent.ACTION_DOWN -> {
                   //handling when single click happens
@@ -78,9 +77,7 @@ fun RatingBar(
                                 it.x, rowSize.width,
                                 numStars, padding.value.toInt()
                             )
-                        val rating=calculatedStars.stepSized(stepSize)
-                        onRatingChanged(rating)
-                        lastKnownValue=rating
+                        rating=calculatedStars.stepSized(stepSize)
                     }
                     MotionEvent.ACTION_MOVE -> {
                    //handling while dragging event
@@ -90,19 +87,17 @@ fun RatingBar(
                                 x1, rowSize.width,
                                 numStars, padding.value.toInt()
                             )
-                        val rating=calculatedStars.stepSized(stepSize)
-                        onRatingChanged(rating)
-                        lastKnownValue=rating
+                        rating=calculatedStars.stepSized(stepSize)
                     }
                     MotionEvent.ACTION_UP -> {
                     //when the click or drag is released
-                        onRatingDone(lastKnownValue)
+                        onRatingChanged(rating)
                     }
                 }
                 true
             }) {
             ComposeStars(
-                value, numStars, size, padding, activeColor,
+                rating, numStars, size, padding, activeColor,
                 inactiveColor, ratingBarStyle
             )
         }
@@ -162,9 +157,7 @@ fun ComposeStars(
 fun RatingBarPreview() {
     var rating by remember { mutableStateOf(3.3f) }
 
-    RatingBar(value = rating,onRatingDone = {
-        Log.d("TAG", "onRatingDone: $it")
-    },onRatingChanged = {
+    RatingBar(value = rating,onRatingChanged = {
         rating=it
     })
 }
diff --git a/ratingbar/src/main/java/com/gowtham/ratingbar/RatingBarUtils.kt b/ratingbar/src/main/java/com/gowtham/ratingbar/RatingBarUtils.kt
@@ -43,6 +43,8 @@ object RatingBarUtils {
         else {
             var value = this.toInt().toFloat()
             if (this < value.plus(0.5)) {
+                if(this==0f)
+                    return 0f
                 value = value.plus(0.5).toFloat()
                 value
             } else