From 572387d7b51835cada2d870f072461545e9416b2 Mon Sep 17 00:00:00 2001 From: Rahul Patel Date: Wed, 20 May 2026 01:27:57 +0530 Subject: [PATCH] downloads: minor syntax change --- .../compose/composable/DownloadListItem.kt | 45 ++++++++++--------- .../com/aurora/store/compose/theme/Color.kt | 3 ++ 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/aurora/store/compose/composable/DownloadListItem.kt b/app/src/main/java/com/aurora/store/compose/composable/DownloadListItem.kt index 290e170bc..cedf13fb0 100644 --- a/app/src/main/java/com/aurora/store/compose/composable/DownloadListItem.kt +++ b/app/src/main/java/com/aurora/store/compose/composable/DownloadListItem.kt @@ -13,7 +13,6 @@ import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource @@ -26,6 +25,8 @@ import com.aurora.store.R import com.aurora.store.compose.composable.app.AnimatedAppIcon import com.aurora.store.compose.preview.AppPreviewProvider import com.aurora.store.compose.preview.ThemePreviewProvider +import com.aurora.store.compose.theme.colorGreen +import com.aurora.store.compose.theme.colorRed import com.aurora.store.data.model.DownloadStatus import com.aurora.store.data.room.download.Download import com.aurora.store.util.CommonUtil.getETAString @@ -59,27 +60,31 @@ fun DownloadListItem(modifier: Modifier = Modifier, download: Download, onClick: progress = download.progress.toFloat() ) }, - trailing = if (download.status == DownloadStatus.COMPLETED) { - { - Icon( - painter = painterResource(R.drawable.ic_check), - contentDescription = stringResource(R.string.download_completed), - tint = Color(0xFF4CAF50) - ) + trailing = when (download.status) { + DownloadStatus.COMPLETED -> { + { + Icon( + painter = painterResource(R.drawable.ic_check), + contentDescription = stringResource(R.string.download_completed), + tint = colorGreen + ) + } } - } else if ( - download.status == DownloadStatus.CANCELLED || - download.status == DownloadStatus.FAILED - ) { - { - Icon( - painter = painterResource(R.drawable.ic_cancel), - contentDescription = stringResource(R.string.download_canceled), - tint = Color(0xFFF44336) - ) + + DownloadStatus.CANCELLED, DownloadStatus.FAILED + -> { + { + Icon( + painter = painterResource(R.drawable.ic_cancel), + contentDescription = stringResource(R.string.download_canceled), + tint = colorRed + ) + } + } + + else -> { + null } - } else { - null } ) } diff --git a/app/src/main/java/com/aurora/store/compose/theme/Color.kt b/app/src/main/java/com/aurora/store/compose/theme/Color.kt index 8e2d709a6..8818eebb2 100644 --- a/app/src/main/java/com/aurora/store/compose/theme/Color.kt +++ b/app/src/main/java/com/aurora/store/compose/theme/Color.kt @@ -9,3 +9,6 @@ import androidx.compose.ui.graphics.Color val warningColor = Color(0xFFFF7600) // Amber val successColor = Color(0xFF1B8738) // Green + +val colorGreen = Color(0xFF4CAF50) +val colorRed = Color(0xFFF44336)