gradient to Chart.kt added

T8RIN · Apr 6, 2022 · 39e4b16 · 39e4b16
1 parent 81b8db2
commit 39e4b16
Show file tree

Hide file tree

Showing 7 changed files with 64 additions and 9 deletions.
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -14,8 +14,8 @@ android {
         applicationId = "ru.tech.papricoin"
         minSdk = 21
         targetSdk = 32
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 2
+        versionName = "1.0.1"
 
     }
 

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 1,
-      "versionName": "1.0",
+      "versionCode": 2,
+      "versionName": "1.0.1",
       "outputFile": "app-release.apk"
     }
   ],

diff --git a/app/src/main/java/ru/tech/papricoin/data/remote/dto/CoinCurrencyDto.kt b/app/src/main/java/ru/tech/papricoin/data/remote/dto/CoinCurrencyDto.kt
@@ -15,5 +15,5 @@ data class CoinCurrencyDto(
 
 val CoinCurrencyDto.coinCurrency
     get() = CoinCurrency(
-        currency = (low + high) / 2
+        currency = open
     )
diff --git a/app/src/main/java/ru/tech/papricoin/presentation/coin_detail/CoinDetailsScreen.kt b/app/src/main/java/ru/tech/papricoin/presentation/coin_detail/CoinDetailsScreen.kt
@@ -56,14 +56,17 @@ fun CoinDetailsScreen(
             )
 
             Surface(color = backgroundColor) {
-                MediumTopAppBar(
+                LargeTopAppBar(
                     modifier = Modifier.statusBarsPadding(),
                     colors = foregroundColors,
                     title = {
                         val st = viewModel.coinDetailState.value
                         if (st is UIState.Success<CoinDetail?>) {
                             st.data?.let { details ->
-                                Text("${details.rank}. ${details.name} (${details.symbol})")
+                                Text(
+                                    "${details.rank}. ${details.name} (${details.symbol})",
+                                    maxLines = 2
+                                )
                             }
                         }
                     },
@@ -168,7 +171,7 @@ fun CoinDetailsScreen(
                                         is UIState.Success -> {
                                             Chart(
                                                 lineChartData = hState.data.map { it.currency },
-                                                MaterialTheme.colorScheme.primary
+                                                color = MaterialTheme.colorScheme.primary
                                             )
                                         }
                                         is UIState.Loading -> {

diff --git a/app/src/main/java/ru/tech/papricoin/presentation/coin_detail/components/Chart.kt b/app/src/main/java/ru/tech/papricoin/presentation/coin_detail/components/Chart.kt
@@ -8,10 +8,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.Path
+import androidx.compose.ui.graphics.drawscope.clipPath
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.core.graphics.ColorUtils
 import java.math.RoundingMode
 import java.text.DecimalFormat
 
@@ -63,16 +68,46 @@ fun Chart(lineChartData: List<Double>, color: Color) {
                     }
                 }
 
+                val clipPath = Path().apply {
+                    lineTo(points.first().x, size.height)
+                    lineTo(points.first().x, points.last().y)
+                }
+
                 for (i in 0 until points.size - 1) {
                     drawLine(
                         start = Offset(points[i].x, points[i].y),
                         end = Offset(points[i + 1].x, points[i + 1].y),
                         color = color,
-                        strokeWidth = 2f
+                    )
+                    clipPath.lineTo(points[i].x, points[i].y)
+                }
+
+                clipPath.apply {
+                    lineTo(points.last().x, points.last().y)
+                    lineTo(points.last().x, size.height)
+                    lineTo(points.first().x, size.height)
+                }
+
+                clipPath(clipPath) {
+                    drawRect(
+                        Brush.verticalGradient(
+                            colors = listOf(
+                                Color(
+                                    ColorUtils.blendARGB(
+                                        color.toArgb(),
+                                        Color.Gray.toArgb(),
+                                        0.6f
+                                    )
+                                ),
+                                Color.Transparent
+                            )
+                        )
                     )
                 }
             }
 
+            Spacer(Modifier.height(20.dp))
+
             Row(
                 verticalAlignment = Alignment.Bottom
             ) {