Mastodon
/
pachli-android
mirror of https://github.com/pachli/pachli-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

prevent empty hashtag in TabPreferenceActivity (#1160)

This commit is contained in:
Konrad Pozniak 2019-03-28 21:10:53 +01:00 committed by GitHub
parent 51a3e0ea5e
commit 29455d5ccd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/com/keylesspalace/tusky/TabPreferenceActivity.kt
View File

@ -192,14 +192,19 @@ class TabPreferenceActivity : BaseActivity(), Injectable, ItemInteractionListene
.create() .create()
editText.onTextChanged { s, _, _, _ -> editText.onTextChanged { s, _, _, _ ->
val input = s.trim() dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = validateHashtag(s)
dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = input.isNotEmpty() && hashtagRegex.matcher(input).matches()
} }
dialog.show() dialog.show()
dialog.getButton(AlertDialog.BUTTON_POSITIVE).isEnabled = validateHashtag(editText.text)
editText.requestFocus() editText.requestFocus()
} }
private fun validateHashtag(input: CharSequence?): Boolean {
val trimmedInput = input?.trim() ?: ""
return trimmedInput.isNotEmpty() && hashtagRegex.matcher(trimmedInput).matches()
}
private fun updateAvailableTabs() { private fun updateAvailableTabs() {
val addableTabs: MutableList<TabData> = mutableListOf() val addableTabs: MutableList<TabData> = mutableListOf()