avior/Neo-Store
1
0
Fork 0
mirror of https://github.com/Aviortheking/Neo-Store.git synced 2025-04-23 03:12:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove: Unneeded isIndeterminate in Cancelable

Browse Source
This commit is contained in:
machiav3lli 2022-05-31 03:02:32 +02:00
parent 11c7197feb
commit 0e6affa96d
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/kotlin/com/looker/droidify/entity/SubEntities.kt
View File

@ -96,17 +96,15 @@ sealed interface PackageState {
sealed class Cancelable( sealed class Cancelable(
@StringRes override val textId: Int, @StringRes override val textId: Int,
override val icon: ImageVector = Icons.Rounded.Close, override val icon: ImageVector = Icons.Rounded.Close
val isIndeterminate: Boolean
) : PackageState ) : PackageState
object Pending : Cancelable(R.string.pending, isIndeterminate = true) object Pending : Cancelable(R.string.pending)
object Connecting : Cancelable(R.string.connecting, isIndeterminate = true) object Connecting : Cancelable(R.string.connecting)
class Downloading(downloaded: Long, total: Long?) : class Downloading(val downloaded: Long, val total: Long?) :
Cancelable(R.string.downloading, isIndeterminate = true) Cancelable(R.string.downloading)
class Installing(isIndeterminate: Boolean) : object Installing : Cancelable(R.string.installing)
Cancelable(R.string.installing, isIndeterminate = isIndeterminate)
sealed class ButtonWork( sealed class ButtonWork(
@StringRes override val textId: Int, @StringRes override val textId: Int,

3
src/main/kotlin/com/looker/droidify/ui/compose/pages/app_detail/components/Header.kt
View File

@ -27,6 +27,7 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import com.looker.droidify.R import com.looker.droidify.R
import com.looker.droidify.entity.Cancelable import com.looker.droidify.entity.Cancelable
import com.looker.droidify.entity.Downloading
import com.looker.droidify.entity.Install import com.looker.droidify.entity.Install
import com.looker.droidify.entity.PackageState import com.looker.droidify.entity.PackageState
import com.looker.droidify.ui.compose.components.MainActionButton import com.looker.droidify.ui.compose.components.MainActionButton
@ -121,7 +122,7 @@ fun TopBarHeader(
DownloadProgress( DownloadProgress(
modifier = Modifier.padding(horizontal = 12.dp), modifier = Modifier.padding(horizontal = 12.dp),
totalSize = 69420, totalSize = 69420,
isIndeterminate = if (state is Cancelable) state.isIndeterminate else true isIndeterminate = state !is Downloading,
) )
} }
} }