code review.

Author: commandiron

compose-loading/src/main/java/com/commandiron/compose_loading/ChasingDots.kt

@@ -21,9 +21,9 @@ import kotlin.math.*
 @Composable
 fun ChasingDots(
     modifier: Modifier = Modifier,
-    size: Dp = 30.dp,
     durationMillis: Int = 2000,
     delayBetweenDotsMillis: Int = 50,
+    size: Dp = 30.dp,
     color: Color = MaterialTheme.colorScheme.surface,
     circleRatio: Float = 0.25f
 ) {

compose-loading/src/main/java/com/commandiron/compose_loading/ChasingTwoDots.kt

@@ -2,7 +2,6 @@ package com.commandiron.compose_loading
 
 import androidx.compose.animation.core.*
 import androidx.compose.foundation.Canvas
-import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.MaterialTheme
@@ -14,35 +13,51 @@ import androidx.compose.ui.geometry.Offset
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
+import com.commandiron.compose_loading.transition.EaseInOut
+import com.commandiron.compose_loading.transition.fractionTransition
 import kotlin.math.cos
 import kotlin.math.sin
 
 @Composable
 fun ChasingTwoDots(
     modifier: Modifier = Modifier,
-    size: DpSize = DpSize(20.dp, 20.dp),
+    durationMillis: Int = 2000,
+    durationBetweenDotsMillis: Int = 400,
+    size: DpSize = DpSize(30.dp, 30.dp),
     color: Color = MaterialTheme.colorScheme.surface,
-    durationMillis: Int = 1800
 ) {
     val transition = rememberInfiniteTransition()
 
-    val dotPathMultiplier1 = transition.chasingDotPathMultiplierTransition(
-        durationMillis =  durationMillis
+    val dotPathMultiplier1 = transition.fractionTransition(
+        initialValue = 0f,
+        targetValue = 1f,
+        fraction = 2,
+        durationMillis = durationMillis,
+        easing = LinearEasing
     )
-    val dotPathMultiplier2 = transition.chasingDotPathMultiplierTransition2(
-        durationMillis =  durationMillis
+    val dotPathMultiplier2 = transition.fractionTransition(
+        initialValue = 0f,
+        targetValue = 1f,
+        fraction = 2,
+        durationMillis = durationMillis,
+        offsetMillis = durationBetweenDotsMillis,
+        easing = LinearEasing
     )
 
-    val circleRadiusMultiplier1 = transition.chasingDotRadiusMultiplierTransition(
+    val circleRadiusMultiplier1 = transition.fractionTransition(
         initialValue = 0f,
         targetValue = 1f,
-        durationMillis = durationMillis / 2
+        durationMillis = durationMillis / 2,
+        repeatMode = RepeatMode.Reverse,
+        easing = EaseInOut
     )
-    val circleRadiusMultiplier2 = transition.chasingDotRadiusMultiplierTransition(
+    val circleRadiusMultiplier2 = transition.fractionTransition(
         initialValue = 0f,
         targetValue = 1f,
         durationMillis = durationMillis / 2,
-        offsetMillis = durationMillis / 2
+        repeatMode = RepeatMode.Reverse,
+        offsetMillis = durationMillis / 2,
+        easing = EaseInOut
     )
 
     Box(
@@ -75,71 +90,4 @@ fun ChasingTwoDots(
             )
         }
     }
-}
-
-@Composable
-internal fun InfiniteTransition.chasingDotPathMultiplierTransition(
-    durationMillis: Int,
-    offsetMillis: Int = 0,
-    easing: Easing = LinearEasing
-): State<Float> {
-    return animateFloat(
-        initialValue = 0f,
-        targetValue = 1f,
-        animationSpec = infiniteRepeatable(
-            animation = keyframes {
-                this.durationMillis = durationMillis
-                0f at 0 with easing
-                1f at durationMillis with easing
-            },
-            RepeatMode.Restart,
-            StartOffset(offsetMillis)
-        )
-    )
-}
-
-@Composable
-internal fun InfiniteTransition.chasingDotPathMultiplierTransition2(
-    durationMillis: Int,
-    offsetMillis: Int = 0,
-    easing: Easing = LinearEasing
-): State<Float> {
-    return animateFloat(
-        initialValue = 0.5f,
-        targetValue = 1f,
-        animationSpec = infiniteRepeatable(
-            animation = keyframes {
-                this.durationMillis = durationMillis
-                0.5f at 0 with easing
-                1f at durationMillis / 2 with easing
-                1.5f at durationMillis with easing
-            },
-            RepeatMode.Restart,
-            StartOffset(offsetMillis)
-        )
-    )
-}
-
-@Composable
-internal fun InfiniteTransition.chasingDotRadiusMultiplierTransition(
-    initialValue: Float,
-    targetValue: Float,
-    durationMillis: Int,
-    offsetMillis: Int = 0,
-    easing: Easing = FastOutSlowInEasing
-): State<Float> {
-    return animateFloat(
-        initialValue = initialValue,
-        targetValue = targetValue,
-        animationSpec = infiniteRepeatable(
-            animation = keyframes {
-                this.durationMillis = durationMillis * 2
-                initialValue at 0 with easing
-                targetValue at durationMillis with easing
-                initialValue at durationMillis * 2 with easing
-            },
-            RepeatMode.Restart,
-            StartOffset(offsetMillis = offsetMillis)
-        )
-    )
 }

compose-loading/src/main/java/com/commandiron/compose_loading/DoubleBounce.kt

@@ -19,9 +19,9 @@ import com.commandiron.compose_loading.transition.fractionTransition
 @Composable
 fun DoubleBounce(
     modifier: Modifier = Modifier,
-    size: DpSize = DpSize(30.dp, 30.dp),
     durationMillis: Int = 2000,
     delayMillis: Int = 0,
+    size: DpSize = DpSize(30.dp, 30.dp),
     color: Color = MaterialTheme.colorScheme.surface,
     shape: Shape = CircleShape
 ) {

compose-loading/src/main/java/com/commandiron/compose_loading/Pulse.kt

@@ -11,37 +11,40 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.commandiron.compose_loading.transition.fractionTransition
 
 @Composable
 fun Pulse(
     modifier: Modifier = Modifier,
-    maxSize: Dp = 30.dp,
+    durationMillis: Int = 1000,
+    delayMillis: Int = 0,
+    size: DpSize = DpSize(30.dp, 30.dp),
     color: Color = MaterialTheme.colorScheme.surface,
     shape: Shape = CircleShape,
-    durationMillis: Int = 1000
 ) {
     val transition = rememberInfiniteTransition()
 
     val sizeMultiplier = transition.fractionTransition(
         initialValue = 0f,
         targetValue = 1f,
-        durationMillis = durationMillis
+        durationMillis = durationMillis,
+        delayMillis = delayMillis
     )
     val alphaMultiplier = transition.fractionTransition(
         initialValue = 1f,
         targetValue = 0f,
-        durationMillis = durationMillis
+        durationMillis = durationMillis,
+        delayMillis = delayMillis
     )
 
     Box(
         modifier = modifier,
         contentAlignment = Alignment.Center
     ){
         Surface(
-            modifier = Modifier.size(maxSize * sizeMultiplier.value),
+            modifier = Modifier.size(size * sizeMultiplier.value),
             shape = shape,
             color = color.copy(alpha = alphaMultiplier.value)
         ) {}

compose-loading/src/main/java/com/commandiron/compose_loading/RotatingPlane.kt

@@ -21,9 +21,9 @@ import com.commandiron.compose_loading.transition.fractionTransition
 @Composable
 fun RotatingPlane(
     modifier: Modifier = Modifier,
-    size: DpSize = DpSize(30.dp, 30.dp),
     durationMillis: Int = 1200,
     delayMillis: Int = 0,
+    size: DpSize = DpSize(30.dp, 30.dp),
     color: Color = MaterialTheme.colorScheme.surface,
     shape: Shape = Shapes.None,
     contentOnPlane: @Composable BoxScope. () -> Unit = {}

compose-loading/src/main/java/com/commandiron/compose_loading/ThreeBounce.kt

@@ -11,18 +11,18 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.DpSize
 import androidx.compose.ui.unit.dp
 import com.commandiron.compose_loading.transition.fractionTransition
 
 @Composable
 fun ThreeBounce(
     modifier: Modifier = Modifier,
-    size: Dp = 30.dp,
+    size: DpSize = DpSize(30.dp, 30.dp),
     color: Color = MaterialTheme.colorScheme.surface,
     shape: Shape = CircleShape,
     durationMillis: Int = 1400,
-    delayBetweenDots: Int = 160
+    delayBetweenDotsMillis: Int = 160
 ) {
     val transition = rememberInfiniteTransition()
 
@@ -38,15 +38,15 @@ fun ThreeBounce(
         targetValue = 1f,
         fraction = 1,
         durationMillis = durationMillis / 2,
-        offsetMillis = delayBetweenDots,
+        offsetMillis = delayBetweenDotsMillis,
         repeatMode = RepeatMode.Reverse
     )
     val sizeMultiplier3 = transition.fractionTransition(
         initialValue = 0f,
         targetValue = 1f,
         fraction = 1,
         durationMillis = durationMillis / 2,
-        offsetMillis = delayBetweenDots * 2,
+        offsetMillis = delayBetweenDotsMillis * 2,
         repeatMode = RepeatMode.Reverse
     )
 
@@ -62,15 +62,15 @@ fun ThreeBounce(
                     color = color
                 ) {}
             }
-            Spacer(modifier = Modifier.width(size / 3 / 4))
+            Spacer(modifier = Modifier.width(size.width / 3 / 4))
             Box(modifier = Modifier.size(size / 3), contentAlignment = Alignment.Center) {
                 Surface(
                     modifier = Modifier.size(size / 3 * sizeMultiplier2.value),
                     shape = shape,
                     color = color
                 ) {}
             }
-            Spacer(modifier = Modifier.width(size / 3 / 4))
+            Spacer(modifier = Modifier.width(size.width / 3 / 4))
             Box(modifier = Modifier.size(size / 3), contentAlignment = Alignment.Center) {
                 Surface(
                     modifier = Modifier.size(size / 3 * sizeMultiplier3.value),

compose-loading/src/main/java/com/commandiron/compose_loading/WanderingCubes.kt

@@ -19,8 +19,8 @@ import com.commandiron.compose_loading.transition.EaseInOut
 @Composable
 fun WanderingCubes(
     modifier: Modifier = Modifier,
-    size: DpSize = DpSize(30.dp, 30.dp),
     durationMillis: Int = 1800,
+    size: DpSize = DpSize(30.dp, 30.dp),
     color: Color = MaterialTheme.colorScheme.surface,
 ) {
     val transition = rememberInfiniteTransition()
@@ -41,15 +41,14 @@ fun WanderingCubes(
     val x2Multiplier = transition.wanderingCubesTransition(
         initialValue = 0f,
         targetValue = 1f,
-        durationMillisPerFraction = durationPerFraction
+        durationMillisPerFraction = durationPerFraction,
     )
     val y2Multiplier = transition.wanderingCubesTransition(
         initialValue = 0f,
         targetValue = 1f,
         durationMillisPerFraction = durationPerFraction,
         offsetMillis = durationPerFraction
     )
-
     val rectHeightMultiplier = transition.wanderingCubesTransition(
         initialValue = 2f,
         targetValue = 1f,
@@ -71,7 +70,6 @@ fun WanderingCubes(
 
             val rectWidth = width / 6
             val rectHeight = height / 6
-            val defaultRectSize = Size(rectWidth, rectHeight)
 
             val rectSize = Size(
                 width = rectWidth * rectWidthMultiplier.value,

compose-loading/src/main/java/com/commandiron/compose_loading/Wave.kt

@@ -18,9 +18,9 @@ import com.commandiron.compose_loading.transition.fractionTransition
 @Composable
 fun Wave(
     modifier: Modifier = Modifier,
-    size: Dp = 24.dp,
     durationMillis: Int = 1200,
     delayMillis: Int = 400,
+    size: Dp = 24.dp,
     color: Color = MaterialTheme.colorScheme.surface,
     shape: Shape = Shapes.None,
 ) {

compose-loading/src/main/java/com/commandiron/compose_loading/transition/Transition.kt

@@ -51,47 +51,4 @@ internal fun InfiniteTransition.fractionTransition(
     )
 }
 
-@Composable
-internal fun InfiniteTransition.fractionTransitionToInitial(
-    initialValue: Float,
-    targetValue: Float,
-    @IntRange(from = 2, to = 4) fraction: Int = 2,
-    durationMillis: Int,
-    delayMillis: Int = 0,
-    offsetMillis: Int = 0,
-    repeatMode: RepeatMode = RepeatMode.Restart,
-    easing: Easing = FastOutSlowInEasing
-): State<Float> {
-    return animateFloat(
-        initialValue = initialValue,
-        targetValue = targetValue,
-        animationSpec = infiniteRepeatable(
-            animation = keyframes {
-                this.durationMillis = durationMillis
-                this.delayMillis = delayMillis
-                initialValue at 0 with easing
-                when(fraction){
-                    2 ->{
-                        targetValue / fraction at durationMillis / fraction with easing
-                        initialValue at durationMillis with easing
-                    }
-                    3 ->{
-                        targetValue / fraction at durationMillis / fraction with easing
-                        targetValue / fraction * 2 at durationMillis / fraction * 2 with easing
-                        initialValue at durationMillis with easing
-                    }
-                    4 ->{
-                        targetValue / fraction at durationMillis / fraction with easing
-                        targetValue / fraction * 2 at durationMillis / fraction * 2 with easing
-                        targetValue / fraction * 3 at durationMillis / fraction * 3 with easing
-                        initialValue at durationMillis with easing
-                    }
-                }
-            },
-            repeatMode,
-            StartOffset(offsetMillis)
-        )
-    )
-}
-
 val EaseInOut = CubicBezierEasing(0.42f, 0f, 0.58f, 1f)