Skip to content
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

Centralize Progress text style #200

Merged
merged 3 commits into from
Nov 19, 2024
Merged

Centralize Progress text style #200

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3f67d9
Centralize Progress text style
LunarX Nov 19, 2024
0a846cd
Apply suggestions from code review
LunarX Nov 19, 2024
4744d02
Clarify Progress comments
LunarX Nov 19, 2024
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
73 changes: 39 additions & 34 deletions ...ain/java/com/infomaniak/swisstransfer/ui/screen/newtransfer/upload/components/Progress.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
package com.infomaniak.swisstransfer.ui.screen.newtransfer.upload.components

import androidx.compose.foundation.layout.Row
import androidx.compose.material3.LocalTextStyle
import androidx.compose.material3.ProvideTextStyle
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.derivedStateOf
Expand All @@ -26,6 +29,7 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.platform.LocalContext
import com.infomaniak.swisstransfer.ui.theme.SwissTransferTheme
import com.infomaniak.swisstransfer.ui.utils.HumanReadableSizeUtils
import com.infomaniak.swisstransfer.ui.utils.PreviewLightAndDark
import com.infomaniak.swisstransfer.workers.UploadWorker
import java.util.Locale

Expand All @@ -34,28 +38,22 @@ fun Progress(
progressState: () -> UploadWorker.UploadProgressUiState,
totalSizeInBytes: Long,
) {
Row {

Percentage({ progressState().uploadedSize }, totalSizeInBytes)

Text(
text = " - ",
style = SwissTransferTheme.typography.labelRegular,
color = SwissTransferTheme.colors.secondaryTextColor,
)

UploadedSize { progressState().uploadedSize }

Text(
text = " / ",
style = SwissTransferTheme.typography.labelRegular,
color = SwissTransferTheme.colors.secondaryTextColor,
)

TotalSize(totalSizeInBytes)
ProvideTextStyle(
value = SwissTransferTheme.typography.labelRegular.copy(color = SwissTransferTheme.colors.secondaryTextColor)
) {
Row {
Percentage({ progressState().uploadedSize }, totalSizeInBytes)
Text(text = " - ")
UploadedSize { progressState().uploadedSize }
Text(text = " / ")
TotalSize(totalSizeInBytes)
}
}
}

/**
* Text style is provided through [LocalTextStyle] inside [Progress], thanks to [ProvideTextStyle].
*/
@Composable
private fun Percentage(uploadedSizeInBytes: () -> Long, totalSizeInBytes: Long) {
val percentageNoDecimals by remember {
Expand All @@ -65,37 +63,44 @@ private fun Percentage(uploadedSizeInBytes: () -> Long, totalSizeInBytes: Long)
}
}

Text(
text = "$percentageNoDecimals%",
style = SwissTransferTheme.typography.labelRegular,
color = SwissTransferTheme.colors.secondaryTextColor,
)
Text(text = "$percentageNoDecimals%")
}

/**
* Text style is provided through [LocalTextStyle] inside [Progress], thanks to [ProvideTextStyle].
*/
@Composable
private fun UploadedSize(uploadedSizeInBytes: () -> Long) {
val context = LocalContext.current
val humanReadableSize by remember {
derivedStateOf { HumanReadableSizeUtils.getHumanReadableSize(context, uploadedSizeInBytes()) }
}

Text(
text = humanReadableSize,
style = SwissTransferTheme.typography.labelRegular,
color = SwissTransferTheme.colors.secondaryTextColor,
)
Text(text = humanReadableSize)
}

/**
* Text style is provided through [LocalTextStyle] inside [Progress], thanks to [ProvideTextStyle].
*/
@Composable
private fun TotalSize(totalSizeInBytes: Long) {
val context = LocalContext.current
val humanReadableTotalSize by remember {
derivedStateOf { HumanReadableSizeUtils.getHumanReadableSize(context, totalSizeInBytes) }
}

Text(
text = humanReadableTotalSize,
style = SwissTransferTheme.typography.labelRegular,
color = SwissTransferTheme.colors.secondaryTextColor,
)
Text(text = humanReadableTotalSize)
}

@PreviewLightAndDark
@Composable
private fun Preview() {
SwissTransferTheme {
Surface {
Progress(
progressState = { UploadWorker.UploadProgressUiState.Progress(73_614L) },
totalSizeInBytes = 3_279_218L,
)
}
}
}
Loading