Merge pull request #63 from nimblehq/release/0.6.0

Release - 0.6.0

Author: hoangnguyen92dn

app/src/main/java/co/nimblehq/compose/crypto/extension/ModifierExt.kt

@@ -0,0 +1,62 @@
+package co.nimblehq.compose.crypto.extension
+
+import android.graphics.BlurMaskFilter
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.drawBehind
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Paint
+import androidx.compose.ui.graphics.drawscope.drawIntoCanvas
+import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.unit.Dp
+import co.nimblehq.compose.crypto.ui.theme.Dimension.Dp0
+
+/**
+ * Original solution: https://github.com/wasim15185/jetpack-compose-crypto/blob/develop/app/src/main/java/co/nimblehq/compose/crypto/extension/BoxShadow.kt
+ * Draw a shadow affect under component
+ *
+ * borderRadius: Border radius of shadow
+ * blurRadius: Blur the shadow
+ * offsetY: Position of shadow according to Y axis
+ * offsetX: Position of shadow according to X axis
+ * spread: Squeeze or release the shadow of CardView
+ */
+fun Modifier.boxShadow(
+    color: Color = Color.Black,
+    borderRadius: Dp = Dp0,
+    blurRadius: Dp = Dp0,
+    offsetY: Dp = Dp0,
+    offsetX: Dp = Dp0,
+    spread: Dp = Dp0,
+    modifier: Modifier = Modifier,
+) = this.then(
+    modifier.drawBehind {
+        this.drawIntoCanvas {
+            val paint = Paint()
+            val frameworkPaint = paint.asFrameworkPaint()
+            val spreadPixel = spread.toPx()
+            val leftPixel = (0f - spreadPixel) + offsetX.toPx()
+            val topPixel = (0f - spreadPixel) + offsetY.toPx()
+            val rightPixel = (this.size.width + spreadPixel)
+            val bottomPixel = (this.size.height + spreadPixel)
+
+            if (blurRadius != Dp0) {
+                /* The feature maskFilter used below to apply the blur effect only works
+                    with hardware acceleration disabled.
+                 */
+                frameworkPaint.maskFilter =
+                    (BlurMaskFilter(blurRadius.toPx(), BlurMaskFilter.Blur.NORMAL))
+            }
+
+            frameworkPaint.color = color.toArgb()
+            it.drawRoundRect(
+                left = leftPixel,
+                top = topPixel,
+                right = rightPixel,
+                bottom = bottomPixel,
+                radiusX = borderRadius.toPx(),
+                radiusY = borderRadius.toPx(),
+                paint
+            )
+        }
+    }
+)

app/src/main/java/co/nimblehq/compose/crypto/ui/base/LoadingState.kt

@@ -0,0 +1,7 @@
+package co.nimblehq.compose.crypto.ui.base
+
+sealed class LoadingState {
+    object Idle : LoadingState()
+    object Loading : LoadingState()
+    object LoadingMore : LoadingState()
+}

app/src/main/java/co/nimblehq/compose/crypto/ui/components/chartintervals/ChartIntervalsButton.kt

@@ -9,9 +9,13 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
-import co.nimblehq.compose.crypto.ui.theme.Color
+import co.nimblehq.compose.crypto.ui.theme.Color.CaribbeanGreen
+import co.nimblehq.compose.crypto.ui.theme.Color.OsloGray
+import co.nimblehq.compose.crypto.ui.theme.Color.Transparent
+import co.nimblehq.compose.crypto.ui.theme.Color.White
 import co.nimblehq.compose.crypto.ui.theme.Dimension.Dp12
 import co.nimblehq.compose.crypto.ui.theme.Dimension.Dp14
 import co.nimblehq.compose.crypto.ui.theme.Dimension.Dp4
@@ -33,9 +37,15 @@ fun ChartIntervalsButtonGroup(
 
         TimeIntervals.values().forEachIndexed { index, interval ->
             val backgroundColor = if (selectedColor.value == index) {
-                Color.CaribbeanGreen
+                CaribbeanGreen
             } else {
-                Color.Transparent
+                Transparent
+            }
+
+            val textColor = if (selectedColor.value == index) {
+                White
+            } else {
+                OsloGray
             }
 
             ChartIntervalsButton(
@@ -45,6 +55,7 @@ fun ChartIntervalsButtonGroup(
                         color = backgroundColor,
                         shape = RoundedCornerShape(Dp12)
                     ),
+                textColor = textColor,
                 interval = interval,
                 onClick = {
                     if (selectedColor.value != index) {
@@ -60,6 +71,7 @@ fun ChartIntervalsButtonGroup(
 @Composable
 fun ChartIntervalsButton(
     modifier: Modifier,
+    textColor: Color,
     interval: TimeIntervals,
     onClick: () -> Unit
 ) {
@@ -69,7 +81,7 @@ fun ChartIntervalsButton(
             .padding(vertical = Dp4, horizontal = Dp8),
         textAlign = TextAlign.Center,
         text = interval.text,
-        color = Color.White,
+        color = textColor,
         style = Style.medium14()
     )
 }

app/src/main/java/co/nimblehq/compose/crypto/ui/preview/HomeScreenPreviewParameterProvider.kt

@@ -2,25 +2,29 @@ package co.nimblehq.compose.crypto.ui.preview
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import co.nimblehq.compose.crypto.lib.IsLoading
+import co.nimblehq.compose.crypto.ui.base.LoadingState
 import co.nimblehq.compose.crypto.ui.uimodel.CoinItemUiModel
 
 class HomeScreenPreviewParameterProvider : PreviewParameterProvider<HomeScreenParams> {
     override val values = sequenceOf(
         HomeScreenParams(
             listOf(coinItemPreview),
             listOf(coinItemPreview),
-            false
+            false,
+            LoadingState.Idle
         ),
         HomeScreenParams(
             listOf(coinItemPreview),
             listOf(coinItemPreview),
-            true
+            true,
+            LoadingState.Loading
         ),
     )
 }
 
 data class HomeScreenParams(
     val myCoins: List<CoinItemUiModel>,
     val trendingCoins: List<CoinItemUiModel>,
-    val isLoading: IsLoading
+    val isMyCoinsLoading: IsLoading,
+    val isTrendingCoinsLoading: LoadingState
 )