Skip to content

Commit

Permalink
Fix openMF#77 Changed responsiveness of Login button based on emptine…
Browse files Browse the repository at this point in the history
…ss of field

Co-authored-by: mehul <iit2017125@iiita.ac.in>
  • Loading branch information
yashk2000 and AroraMehul committed Jun 5, 2020
1 parent d24ed90 commit 62b8909
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 9 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,22 @@ import androidx.databinding.DataBindingUtil
import org.mifos.visionppi.R
import org.mifos.visionppi.databinding.ActivityLoginBinding
import android.os.StrictMode
import android.text.Editable
import android.text.TextWatcher
import kotlinx.android.synthetic.main.activity_login.*
import org.mifos.visionppi.ui.home.MainActivity


/**
* Created by Apoorva M K on 25/06/19.
*/

class LoginActivity: AppCompatActivity(), LoginMVPView {
class LoginActivity : AppCompatActivity(), LoginMVPView {

private lateinit var username: String
private lateinit var password: String
private lateinit var binding: ActivityLoginBinding
private var mLoginPresenter: LoginPresenter = LoginPresenter()
private var mLoginPresenter: LoginPresenter = LoginPresenter()

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
Expand All @@ -41,6 +44,45 @@ class LoginActivity: AppCompatActivity(), LoginMVPView {
}
}

binding.etUsername.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(p0: Editable?) {
}

override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}

override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
if (et_password.text.toString().isNotEmpty() && et_username.text.toString()
.isNotEmpty()
) {
login_btn.alpha = 1.0F
login_btn.isEnabled = true
} else {
login_btn.alpha = 0.5F
login_btn.isEnabled = false
}
}
})

binding.etPassword.addTextChangedListener(object : TextWatcher {
override fun afterTextChanged(p0: Editable?) {
}

override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
}

override fun onTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
if (et_password.text.toString().isNotEmpty() && et_username.text.toString()
.isNotEmpty()
) {
login_btn.alpha = 1.0F
login_btn.isEnabled = true
} else {
login_btn.alpha = 0.5F
login_btn.isEnabled = false
}
}
})
}

private fun login() {
Expand All @@ -50,12 +92,12 @@ class LoginActivity: AppCompatActivity(), LoginMVPView {

if (validateUserInput()) {

val loginResult: Boolean = mLoginPresenter.login(username, password, applicationContext, this)
val loginResult: Boolean =
mLoginPresenter.login(username, password, applicationContext, this)

if(loginResult){
if (loginResult) {
onLoginSuccessful()
}
else{
} else {
onLoginError()
}
}
Expand Down Expand Up @@ -88,10 +130,11 @@ class LoginActivity: AppCompatActivity(), LoginMVPView {
showToastMessage(getString(R.string.login_fail))
}

private fun networkAvailable (activity:AppCompatActivity): Boolean{
val connectivityManager = activity.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
private fun networkAvailable(activity: AppCompatActivity): Boolean {
val connectivityManager =
activity.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager
val networkInfo = connectivityManager.activeNetworkInfo
return networkInfo != null && networkInfo.isConnected
return networkInfo != null && networkInfo.isConnected
}

}
2 changes: 2 additions & 0 deletions visionppi/app/src/main/res/layout/activity_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/login_btn"
android:alpha="0.5"
android:enabled="false"
android:layout_marginTop="@dimen/ll_margin"
android:paddingLeft="@dimen/text_input_spacing"
android:paddingRight="@dimen/text_input_spacing"
Expand Down

0 comments on commit 62b8909

Please sign in to comment.