Skip to content

Display file download priority in files list #390

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mhsngr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Display file download priority in files list #390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion app/src/main/kotlin/org/equeim/tremotesf/ui/addtorrent/AddTorrentFileScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ import org.equeim.tremotesf.ui.components.TremotesfRuntimePermissionHelper
import org.equeim.tremotesf.ui.components.TremotesfScrollableTopAppBarWithSubtitle
import org.equeim.tremotesf.ui.components.TremotesfTopAppBarDefaults
import org.equeim.tremotesf.ui.components.TremotesfTorrentsFilesList
import org.equeim.tremotesf.ui.components.withFilePriority
import org.equeim.tremotesf.ui.components.rememberTremotesfRuntimePermissionHelperState
import org.equeim.tremotesf.ui.utils.rememberFileSizeFormatter

Expand Down Expand Up @@ -447,7 +448,9 @@ private fun FilesTab(
TremotesfTorrentsFilesList(
filesTree = filesTree,
contentPadding = innerPadding,
itemSupportingContent = { Text(fileSizeFormatter.formatFileSize(FileSize.fromBytes(it.size))) },
itemSupportingContent = {
Text(withFilePriority(fileSizeFormatter.formatFileSize(FileSize.fromBytes(it.size)), it.priority))
},
modifier = Modifier.fillMaxSize()
)
}
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/kotlin/org/equeim/tremotesf/ui/components/TremotesfTorrentFilesList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ import kotlinx.coroutines.launch
import kotlinx.parcelize.Parcelize
import org.equeim.tremotesf.R
import org.equeim.tremotesf.torrentfile.TorrentFilesTree
import org.equeim.tremotesf.torrentfile.TorrentFilesTree.Item.Priority
import org.equeim.tremotesf.torrentfile.TorrentFilesTree.Item.WantedState
import org.equeim.tremotesf.ui.Dimens
import org.equeim.tremotesf.ui.FileDownload
Expand Down Expand Up @@ -403,3 +404,14 @@ private fun computeSelectedItemsPriority(
}
return priority ?: TorrentFilesTree.Item.Priority.Normal
}

@Composable
fun withFilePriority(text: String, priority: Priority): String {
val priorityNameId = when (priority) {
Priority.Normal -> return text
Priority.High -> R.string.high_priority
Priority.Low -> R.string.low_pririty
Priority.Mixed -> R.string.mixed_priority
}
return stringResource(R.string.string_with_priority, text, stringResource(priorityNameId))
}
14 changes: 9 additions & 5 deletions app/src/main/kotlin/org/equeim/tremotesf/ui/torrentproperties/FilesTab.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ import org.equeim.tremotesf.ui.Dimens
import org.equeim.tremotesf.ui.components.TremotesfErrorPlaceholder
import org.equeim.tremotesf.ui.components.TremotesfLoadingPlaceholder
import org.equeim.tremotesf.ui.components.TremotesfTorrentsFilesList
import org.equeim.tremotesf.ui.components.withFilePriority
import org.equeim.tremotesf.ui.utils.rememberFileSizeFormatter
import org.equeim.tremotesf.ui.utils.rememberNumberFormat
import java.text.DecimalFormat
Expand Down Expand Up @@ -102,11 +103,14 @@ fun FilesTab(
Column(Modifier.fillMaxWidth(), verticalArrangement = Arrangement.spacedBy(Dimens.SpacingSmall)) {
LinearProgressIndicator(progress = { it.progress }, gapSize = 0.dp, drawStopIndicator = {})
Text(
stringResource(
R.string.completed_string,
fileSizeFormatter.formatFileSize(FileSize.fromBytes(it.completedSize)),
fileSizeFormatter.formatFileSize(FileSize.fromBytes(it.size)),
progressFormatter.format(it.progress * 100)
withFilePriority(
stringResource(
R.string.completed_string,
fileSizeFormatter.formatFileSize(FileSize.fromBytes(it.completedSize)),
fileSizeFormatter.formatFileSize(FileSize.fromBytes(it.size)),
progressFormatter.format(it.progress * 100)
),
it.priority
)
)
}
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,8 @@ SPDX-License-Identifier: GPL-3.0-or-later
<string name="normal_priority">Normal</string>
<string name="low_pririty">Low</string>
<string name="mixed_priority">Mixed</string>
<!-- e.g. "100 MiB · High" -->
<string name="string_with_priority">%1$s \u00b7 %2$s</string>

<string name="download_verb">Download</string>
<string name="not_download">Not download</string>
Expand Down