bida/busky
9
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fix poll validation (#1459)

Browse source
This commit is contained in:
Konrad Pozniak 2019-08-27 20:27:38 +02:00 committed by GitHub
parent b703097d17
commit 44163d8720
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/keylesspalace/tusky/adapter/AddPollOptionsAdapter.kt
View file

@ -30,7 +30,7 @@ import com.keylesspalace.tusky.util.visible
class AddPollOptionsAdapter( class AddPollOptionsAdapter(
private var options: MutableList<String>, private var options: MutableList<String>,
private val maxOptionLength: Int, private val maxOptionLength: Int,
private val onOptionRemoved: () -> Unit, private val onOptionRemoved: (Boolean) -> Unit,
private val onOptionChanged: (Boolean) -> Unit private val onOptionChanged: (Boolean) -> Unit
): RecyclerView.Adapter<ViewHolder>() { ): RecyclerView.Adapter<ViewHolder>() {
@ -70,7 +70,7 @@ class AddPollOptionsAdapter(
holder.editText.clearFocus() holder.editText.clearFocus()
options.removeAt(holder.adapterPosition) options.removeAt(holder.adapterPosition)
notifyItemRemoved(holder.adapterPosition) notifyItemRemoved(holder.adapterPosition)
onOptionRemoved() onOptionRemoved(validateInput())
} }
} }

3
app/src/main/java/com/keylesspalace/tusky/view/AddPollDialog.kt
View file

@ -48,8 +48,9 @@ fun showAddPollDialog(
val adapter = AddPollOptionsAdapter( val adapter = AddPollOptionsAdapter(
options = poll?.options?.toMutableList() ?: mutableListOf("", ""), options = poll?.options?.toMutableList() ?: mutableListOf("", ""),
maxOptionLength = maxOptionLength ?: DEFAULT_MAX_OPTION_LENGTH, maxOptionLength = maxOptionLength ?: DEFAULT_MAX_OPTION_LENGTH,
onOptionRemoved = { onOptionRemoved = { valid ->
view.addChoiceButton.isEnabled = true view.addChoiceButton.isEnabled = true
dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = valid
}, },
onOptionChanged = { valid -> onOptionChanged = { valid ->
dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = valid dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = valid