From 0e6affa96da9480d11a9f8b2a6a834aafcec15b4 Mon Sep 17 00:00:00 2001 From: machiav3lli Date: Tue, 31 May 2022 03:02:32 +0200 Subject: [PATCH] Remove: Unneeded isIndeterminate in Cancelable --- .../com/looker/droidify/entity/SubEntities.kt | 14 ++++++-------- .../compose/pages/app_detail/components/Header.kt | 3 ++- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/com/looker/droidify/entity/SubEntities.kt b/src/main/kotlin/com/looker/droidify/entity/SubEntities.kt index 015116d1..35e837b5 100644 --- a/src/main/kotlin/com/looker/droidify/entity/SubEntities.kt +++ b/src/main/kotlin/com/looker/droidify/entity/SubEntities.kt @@ -96,17 +96,15 @@ sealed interface PackageState { sealed class Cancelable( @StringRes override val textId: Int, - override val icon: ImageVector = Icons.Rounded.Close, - val isIndeterminate: Boolean + override val icon: ImageVector = Icons.Rounded.Close ) : PackageState -object Pending : Cancelable(R.string.pending, isIndeterminate = true) -object Connecting : Cancelable(R.string.connecting, isIndeterminate = true) -class Downloading(downloaded: Long, total: Long?) : - Cancelable(R.string.downloading, isIndeterminate = true) +object Pending : Cancelable(R.string.pending) +object Connecting : Cancelable(R.string.connecting) +class Downloading(val downloaded: Long, val total: Long?) : + Cancelable(R.string.downloading) -class Installing(isIndeterminate: Boolean) : - Cancelable(R.string.installing, isIndeterminate = isIndeterminate) +object Installing : Cancelable(R.string.installing) sealed class ButtonWork( @StringRes override val textId: Int, diff --git a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt b/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt index 358f297a..3b905d4e 100644 --- a/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt +++ b/src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt @@ -27,6 +27,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import com.looker.droidify.R import com.looker.droidify.entity.Cancelable +import com.looker.droidify.entity.Downloading import com.looker.droidify.entity.Install import com.looker.droidify.entity.PackageState import com.looker.droidify.ui.compose.components.MainActionButton @@ -121,7 +122,7 @@ fun TopBarHeader( DownloadProgress( modifier = Modifier.padding(horizontal = 12.dp), totalSize = 69420, - isIndeterminate = if (state is Cancelable) state.isIndeterminate else true + isIndeterminate = state !is Downloading, ) } }