Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Rename progress variable to percentage

Browse source
This commit is contained in:
Florian Renaud 2023-08-18 10:17:48 +02:00
parent c1d2114b60
commit cfe8430733
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/factories/event/TimelineItemContentPollFactory.kt
View file

@ -41,7 +41,7 @@ class TimelineItemContentPollFactory @Inject constructor(
val answerItems = content.answers.map { answer -> val answerItems = content.answers.map { answer ->
val votesCount = content.votes[answer.id]?.size ?: 0 val votesCount = content.votes[answer.id]?.size ?: 0
val isSelected = answer.id in userVotes val isSelected = answer.id in userVotes
val progress = when { val percentage = when {
pollVotesCount == 0 -> 0f pollVotesCount == 0 -> 0f
content.kind.isDisclosed -> votesCount.toFloat() / pollVotesCount.toFloat() content.kind.isDisclosed -> votesCount.toFloat() / pollVotesCount.toFloat()
isSelected -> 1f isSelected -> 1f
@ -52,7 +52,7 @@ class TimelineItemContentPollFactory @Inject constructor(
isSelected = isSelected, isSelected = isSelected,
isDisclosed = content.kind.isDisclosed, isDisclosed = content.kind.isDisclosed,
votesCount = votesCount, votesCount = votesCount,
progress = progress, percentage = percentage,
) )
} }

4
features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollAnswerItem.kt
View file

@ -25,12 +25,12 @@ import io.element.android.libraries.matrix.api.poll.PollAnswer
* @property isSelected whether the user has selected this answer. * @property isSelected whether the user has selected this answer.
* @property isDisclosed whether the votes for this answer should be disclosed. * @property isDisclosed whether the votes for this answer should be disclosed.
* @property votesCount the number of votes for this answer. * @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( data class PollAnswerItem(
val answer: PollAnswer, val answer: PollAnswer,
val isSelected: Boolean, val isSelected: Boolean,
val isDisclosed: Boolean, val isDisclosed: Boolean,
val votesCount: Int, val votesCount: Int,
val progress: Float, val percentage: Float,
) )

2
features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollAnswerView.kt
View file

@ -101,7 +101,7 @@ fun PollAnswerView(
Spacer(modifier = Modifier.height(10.dp)) Spacer(modifier = Modifier.height(10.dp))
LinearProgressIndicator( LinearProgressIndicator(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
progress = answerItem.progress, progress = answerItem.percentage,
strokeCap = StrokeCap.Round, strokeCap = StrokeCap.Round,
) )
} }

10
features/poll/api/src/main/kotlin/io/element/android/features/poll/api/PollAnswerViewProvider.kt
View file

@ -24,20 +24,20 @@ fun aPollAnswerItemList(isDisclosed: Boolean = true) = persistentListOf(
answer = PollAnswer("option_1", "Italian \uD83C\uDDEE\uD83C\uDDF9"), answer = PollAnswer("option_1", "Italian \uD83C\uDDEE\uD83C\uDDF9"),
isDisclosed = isDisclosed, isDisclosed = isDisclosed,
votesCount = 5, votesCount = 5,
progress = 0.5f percentage = 0.5f
), ),
aPollAnswerItem( aPollAnswerItem(
answer = PollAnswer("option_2", "Chinese \uD83C\uDDE8\uD83C\uDDF3"), answer = PollAnswer("option_2", "Chinese \uD83C\uDDE8\uD83C\uDDF3"),
isDisclosed = isDisclosed, isDisclosed = isDisclosed,
votesCount = 0, votesCount = 0,
progress = 0f percentage = 0f
), ),
aPollAnswerItem( aPollAnswerItem(
answer = PollAnswer("option_3", "Brazilian \uD83C\uDDE7\uD83C\uDDF7"), answer = PollAnswer("option_3", "Brazilian \uD83C\uDDE7\uD83C\uDDF7"),
isDisclosed = isDisclosed, isDisclosed = isDisclosed,
isSelected = true, isSelected = true,
votesCount = 1, votesCount = 1,
progress = 0.1f percentage = 0.1f
), ),
aPollAnswerItem(isDisclosed = isDisclosed), aPollAnswerItem(isDisclosed = isDisclosed),
) )
@ -50,11 +50,11 @@ fun aPollAnswerItem(
isSelected: Boolean = false, isSelected: Boolean = false,
isDisclosed: Boolean = true, isDisclosed: Boolean = true,
votesCount: Int = 4, votesCount: Int = 4,
progress: Float = 0.4f, percentage: Float = 0.4f,
) = PollAnswerItem( ) = PollAnswerItem(
answer = answer, answer = answer,
isSelected = isSelected, isSelected = isSelected,
isDisclosed = isDisclosed, isDisclosed = isDisclosed,
votesCount = votesCount, votesCount = votesCount,
progress = progress percentage = percentage
) )