highperfocused/amethyst
1
0
Fork 0
mirror of https://github.com/vitorpamplona/amethyst.git synced 2025-10-06 22:53:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/vitorpamplona/amethyst

Browse Source
This commit is contained in:
Vitor Pamplona
2024-07-09 09:30:07 -04:00
parent 2074b34ec3 25ba353488
commit 4521317779
2 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
View File

@@ -630,17 +630,21 @@ private fun BottomRowActions(postViewModel: NewPostViewModel) {
@Composable @Composable
private fun PollField(postViewModel: NewPostViewModel) { private fun PollField(postViewModel: NewPostViewModel) {
val optionsList = postViewModel.pollOptions
Column( Column(
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
) { ) {
postViewModel.pollOptions.values.forEachIndexed { index, _ -> optionsList.forEach { value ->
NewPollOption(postViewModel, index) NewPollOption(postViewModel, value.key)
} }
NewPollVoteValueRange(postViewModel) NewPollVoteValueRange(postViewModel)
Button( Button(
onClick = { postViewModel.pollOptions[postViewModel.pollOptions.size] = "" }, onClick = {
// postViewModel.pollOptions[postViewModel.pollOptions.size] = ""
optionsList[optionsList.size] = ""
},
border = border =
BorderStroke( BorderStroke(
1.dp, 1.dp,

18
amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
View File

@@ -1278,10 +1278,26 @@ open class NewPostViewModel : ViewModel() {
} }
fun removePollOption(optionIndex: Int) { fun removePollOption(optionIndex: Int) {
pollOptions.remove(optionIndex) pollOptions.removeOrdered(optionIndex)
saveDraft() saveDraft()
} }
private fun MutableMap<Int, String>.removeOrdered(index: Int) {
val keyList = keys
val elementList = values.toMutableList()
run stop@{
for (i in index until elementList.size) {
val nextIndex = i + 1
if (nextIndex == elementList.size) return@stop
elementList[i] = elementList[nextIndex].also { elementList[nextIndex] = "null" }
}
}
elementList.removeLast()
val newEntries = keyList.zip(elementList) { key, content -> Pair(key, content) }
this.clear()
this.putAll(newEntries)
}
fun updatePollOption( fun updatePollOption(
optionIndex: Int, optionIndex: Int,
text: String, text: String,