mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge d00e6502b1 into 28fa7b1a20

Browse source
This commit is contained in:
VoidRaven 2025-10-26 00:59:13 +05:30 • committed by GitHub
commit 2a8697743c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.kt
View file

@ -14,7 +14,6 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.view.inputmethod.EditorInfo import android.view.inputmethod.EditorInfo
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import android.widget.TextView
import androidx.annotation.ColorRes import androidx.annotation.ColorRes
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.annotation.VisibleForTesting import androidx.annotation.VisibleForTesting
@ -284,11 +283,11 @@ class LoginActivity : AccountAuthenticatorActivity() {
} }
} }
private fun onEditorAction(textView: TextView, actionId: Int, keyEvent: KeyEvent?) = // private fun onEditorAction(textView: TextView, actionId: Int, keyEvent: KeyEvent?) =
if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) { // if (binding!!.loginButton.isEnabled && isTriggerAction(actionId, keyEvent)) {
performLogin() // performLogin()
true // true
} else false // } else false
private fun isTriggerAction(actionId: Int, keyEvent: KeyEvent?) = private fun isTriggerAction(actionId: Int, keyEvent: KeyEvent?) =
actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_DONE || keyEvent?.keyCode == KeyEvent.KEYCODE_ENTER
@ -472,8 +471,8 @@ class LoginActivity : AccountAuthenticatorActivity() {
private fun onTextChanged(text: String) { private fun onTextChanged(text: String) {
val enabled = val enabled =
binding!!.loginUsername.text!!.length != 0 && binding!!.loginPassword.text!!.length != 0 && binding!!.loginUsername.text!!.isNotEmpty() && binding!!.loginPassword.text!!.isNotEmpty() &&
(BuildConfig.DEBUG || binding!!.loginTwoFactor.text!!.length != 0 || binding!!.loginTwoFactor.visibility != View.VISIBLE) (BuildConfig.DEBUG || binding!!.loginTwoFactor.text!!.isNotEmpty() || binding!!.loginTwoFactor.visibility != View.VISIBLE)
binding!!.loginButton.isEnabled = enabled binding!!.loginButton.isEnabled = enabled
} }