From 63b7bbb0315411b1b8c843062f26ba341a22e6b0 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Mon, 1 Sep 2025 15:58:17 +0800 Subject: [PATCH] compose: details: Show download speed and version on same line Signed-off-by: Aayush Gupta --- .../compose/ui/details/components/Details.kt | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/components/Details.kt b/app/src/main/java/com/aurora/store/compose/ui/details/components/Details.kt index 8b62d0c0a..a95e4e4a2 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/components/Details.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/components/Details.kt @@ -78,25 +78,25 @@ fun Details( color = MaterialTheme.colorScheme.primary ) Text( - text = if (!isUpdatable) { - stringResource(R.string.version, app.versionName, app.versionCode) - } else { - stringResource( - R.string.version_update, - PackageUtil.getInstalledVersionName(context, app.packageName), - PackageUtil.getInstalledVersionCode(context, app.packageName), - app.versionName, - app.versionCode - ) - }, - style = MaterialTheme.typography.bodySmall - ) - Text( - text = if (inProgress) { - "${Formatter.formatShortFileSize(context, speed)}/s" + - ", " + CommonUtil.getETAString(context, timeRemaining) - } else { - "" + text = when { + inProgress -> { + "${Formatter.formatShortFileSize(context, speed)}/s" + + ", " + CommonUtil.getETAString(context, timeRemaining) + } + + isUpdatable -> { + stringResource( + R.string.version_update, + PackageUtil.getInstalledVersionName(context, app.packageName), + PackageUtil.getInstalledVersionCode(context, app.packageName), + app.versionName, + app.versionCode + ) + } + + else -> { + stringResource(R.string.version, app.versionName, app.versionCode) + } }, style = MaterialTheme.typography.bodySmall )