Rename progress variable to percentage
This commit is contained in:
parent
df1be4f6b1
commit
d59349184f
4 changed files with 10 additions and 10 deletions
|
|
@ -41,7 +41,7 @@ class TimelineItemContentPollFactory @Inject constructor(
|
|||
val answerItems = content.answers.map { answer ->
|
||||
val votesCount = content.votes[answer.id]?.size ?: 0
|
||||
val isSelected = answer.id in userVotes
|
||||
val progress = when {
|
||||
val percentage = when {
|
||||
pollVotesCount == 0 -> 0f
|
||||
content.kind.isDisclosed -> votesCount.toFloat() / pollVotesCount.toFloat()
|
||||
isSelected -> 1f
|
||||
|
|
@ -52,7 +52,7 @@ class TimelineItemContentPollFactory @Inject constructor(
|
|||
isSelected = isSelected,
|
||||
isDisclosed = content.kind.isDisclosed,
|
||||
votesCount = votesCount,
|
||||
progress = progress,
|
||||
percentage = percentage,
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@ import io.element.android.libraries.matrix.api.poll.PollAnswer
|
|||
* @property isSelected whether the user has selected this answer.
|
||||
* @property isDisclosed whether the votes for this answer should be disclosed.
|
||||
* @property votesCount the number of votes for this answer.
|
||||
* @property progress the percentage of votes for this answer.
|
||||
* @property percentage the percentage of votes for this answer.
|
||||
*/
|
||||
data class PollAnswerItem(
|
||||
val answer: PollAnswer,
|
||||
val isSelected: Boolean,
|
||||
val isDisclosed: Boolean,
|
||||
val votesCount: Int,
|
||||
val progress: Float,
|
||||
val percentage: Float,
|
||||
)
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ fun PollAnswerView(
|
|||
Spacer(modifier = Modifier.height(10.dp))
|
||||
LinearProgressIndicator(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
progress = answerItem.progress,
|
||||
progress = answerItem.percentage,
|
||||
strokeCap = StrokeCap.Round,
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -24,20 +24,20 @@ fun aPollAnswerItemList(isDisclosed: Boolean = true) = persistentListOf(
|
|||
answer = PollAnswer("option_1", "Italian \uD83C\uDDEE\uD83C\uDDF9"),
|
||||
isDisclosed = isDisclosed,
|
||||
votesCount = 5,
|
||||
progress = 0.5f
|
||||
percentage = 0.5f
|
||||
),
|
||||
aPollAnswerItem(
|
||||
answer = PollAnswer("option_2", "Chinese \uD83C\uDDE8\uD83C\uDDF3"),
|
||||
isDisclosed = isDisclosed,
|
||||
votesCount = 0,
|
||||
progress = 0f
|
||||
percentage = 0f
|
||||
),
|
||||
aPollAnswerItem(
|
||||
answer = PollAnswer("option_3", "Brazilian \uD83C\uDDE7\uD83C\uDDF7"),
|
||||
isDisclosed = isDisclosed,
|
||||
isSelected = true,
|
||||
votesCount = 1,
|
||||
progress = 0.1f
|
||||
percentage = 0.1f
|
||||
),
|
||||
aPollAnswerItem(isDisclosed = isDisclosed),
|
||||
)
|
||||
|
|
@ -50,11 +50,11 @@ fun aPollAnswerItem(
|
|||
isSelected: Boolean = false,
|
||||
isDisclosed: Boolean = true,
|
||||
votesCount: Int = 4,
|
||||
progress: Float = 0.4f,
|
||||
percentage: Float = 0.4f,
|
||||
) = PollAnswerItem(
|
||||
answer = answer,
|
||||
isSelected = isSelected,
|
||||
isDisclosed = isDisclosed,
|
||||
votesCount = votesCount,
|
||||
progress = progress
|
||||
percentage = percentage
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue