diff --git a/app/src/main/java/com/aurora/store/data/model/DownloadStatus.kt b/app/src/main/java/com/aurora/store/data/model/DownloadStatus.kt index 50acca9f4..1b58c01b4 100644 --- a/app/src/main/java/com/aurora/store/data/model/DownloadStatus.kt +++ b/app/src/main/java/com/aurora/store/data/model/DownloadStatus.kt @@ -1,12 +1,15 @@ package com.aurora.store.data.model -enum class DownloadStatus { - DOWNLOADING, - FAILED, - CANCELLED, - COMPLETED, - QUEUED, - UNAVAILABLE; +import androidx.annotation.StringRes +import com.aurora.store.R + +enum class DownloadStatus(@StringRes val localized: Int) { + DOWNLOADING(R.string.status_downloading), + FAILED(R.string.status_failed), + CANCELLED(R.string.status_cancelled), + COMPLETED(R.string.status_completed), + QUEUED(R.string.status_queued), + UNAVAILABLE(R.string.status_unavailable); companion object { val finished = listOf(FAILED, CANCELLED, COMPLETED) diff --git a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt index ab5509985..260bc2324 100644 --- a/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt +++ b/app/src/main/java/com/aurora/store/view/epoxy/views/DownloadView.kt @@ -32,7 +32,6 @@ import com.aurora.store.data.room.download.Download import com.aurora.store.databinding.ViewDownloadBinding import com.aurora.store.util.CommonUtil.getDownloadSpeedString import com.aurora.store.util.CommonUtil.getETAString -import java.util.Locale @ModelView( autoLayout = ModelView.Size.MATCH_WIDTH_WRAP_HEIGHT, @@ -51,16 +50,7 @@ class DownloadView @JvmOverloads constructor( transformations(RoundedCornersTransformation(32F)) } binding.txtTitle.text = download.displayName - - binding.txtStatus.text = download.downloadStatus.name - .lowercase(Locale.getDefault()) - .replaceFirstChar { - if (it.isLowerCase()) { - it.titlecase(Locale.getDefault()) - } else { - it.toString() - } - } + binding.txtStatus.text = context.getString(download.downloadStatus.localized) binding.progressDownload.apply { progress = download.progress diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2526ab7fc..c9f489cbf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -415,8 +415,6 @@ More Manage your account - - Clear device owner Removes Aurora Store as the device owner app @@ -459,4 +457,12 @@ Restart Aurora Store Aurora Store needs to be restarted to apply the newly changed settings + + + Downloading + Failed + Cancelled + Completed + Queued + Unavailable