Delete ProgressDialog (in favor of our custom indicator). Override functions.

app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt

@@ -11,12 +11,23 @@ import chat.rocket.android.R
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.authentication.signup.presentation.SignupPresenter
 import chat.rocket.android.authentication.signup.presentation.SignupView
+import chat.rocket.android.helper.AnimationHelper
+import chat.rocket.android.util.setVisibility
 import chat.rocket.android.util.textContent
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_sign_up.*
 import javax.inject.Inject
 
 class SignupFragment : Fragment(), SignupView {
+    @Inject lateinit var presenter: SignupPresenter
+    lateinit var serverUrl: String
+    private val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
+        if (KeyboardHelper.isSoftKeyboardShown(constraint_layout.rootView)) {
+            text_new_user_agreement.visibility = View.GONE
+        } else {
+            text_new_user_agreement.visibility = View.VISIBLE
+        }
+    }
 
     companion object {
         private const val SERVER_URL = "server_url"
@@ -28,11 +39,6 @@ class SignupFragment : Fragment(), SignupView {
         }
     }
 
-    @Inject
-    lateinit var presenter: SignupPresenter
-    var progress: ProgressDialog? = null
-    lateinit var serverUrl: String
-
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidSupportInjection.inject(this)
         super.onCreate(savedInstanceState)
@@ -55,18 +61,31 @@ class SignupFragment : Fragment(), SignupView {
         setupGlobalLayoutListener()
 
         button_sign_up.setOnClickListener {
-            val email = text_email.textContent
-            val name = text_name.textContent
-            val username = text_username.textContent
-            val password = text_password.textContent
-
-            presenter.signup(email, name, username, password)
+            presenter.signup(text_name, text_email, text_username, text_password)
         }
     }
 
     override fun onDestroyView() {
-        constraint_layout.viewTreeObserver.removeOnGlobalLayoutListener(layoutListener)
         super.onDestroyView()
+        constraint_layout.viewTreeObserver.removeOnGlobalLayoutListener(layoutListener)
+    }
+
+
+    override fun showLoading() {
+        view_loading.setVisibility(true)
+    }
+
+    override fun hideLoading() {
+        view_loading.setVisibility(false)
+    }
+
+    override fun showMessage(message: String) {
+        Toast.makeText(activity, message, Toast.LENGTH_SHORT).show()
+    }
+
+    override fun shakeView(viewToShake: View) {
+        AnimationHelper.vibrate(viewToShake.context)
+        AnimationHelper.shakeView(viewToShake)
     }
 
     private fun tintEditTextDrawableStart() {
@@ -86,31 +105,4 @@ class SignupFragment : Fragment(), SignupView {
     private fun setupGlobalLayoutListener() {
         constraint_layout.viewTreeObserver.addOnGlobalLayoutListener(layoutListener)
     }
-
-    val layoutListener = ViewTreeObserver.OnGlobalLayoutListener {
-        if (KeyboardHelper.isSoftKeyboardShown(constraint_layout.rootView)) {
-            text_new_user_agreement.visibility = View.GONE
-        } else {
-            text_new_user_agreement.visibility = View.VISIBLE
-        }
-    }
-
-    override fun showLoading() {
-        // TODO - change for a proper progress indicator
-        progress = ProgressDialog.show(activity, "Authenticating",
-                "Registering user", true, true)
-    }
-
-    override fun hideLoading() {
-        progress?.apply {
-            cancel()
-        }
-        progress = null
-    }
-
-    override fun onSignupError(message: String?) {
-        // TODO - show a proper error message
-        Toast.makeText(activity, message, Toast.LENGTH_LONG).show()
-    }
-
 }
\ No newline at end of file

app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt

 package chat.rocket.android.authentication.twofactor.ui
 
 import DrawableHelper
-import android.app.ProgressDialog
 import android.os.Build
 import android.os.Bundle
 import android.support.v4.app.Fragment
@@ -13,12 +12,18 @@ import android.widget.Toast
 import chat.rocket.android.R
 import chat.rocket.android.authentication.twofactor.presentation.TwoFAPresenter
 import chat.rocket.android.authentication.twofactor.presentation.TwoFAView
+import chat.rocket.android.helper.AnimationHelper
+import chat.rocket.android.util.setVisibility
 import chat.rocket.android.util.textContent
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.fragment_authentication_two_fa.*
 import javax.inject.Inject
 
 class TwoFAFragment : Fragment(), TwoFAView {
+    @Inject lateinit var presenter: TwoFAPresenter
+    lateinit var serverUrl: String
+    lateinit var username: String
+    lateinit var password: String
 
     companion object {
         private const val SERVER_URL = "server_url"
@@ -34,14 +39,6 @@ class TwoFAFragment : Fragment(), TwoFAView {
         }
     }
 
-    var progress: ProgressDialog? = null
-    lateinit var serverUrl: String
-    lateinit var username: String
-    lateinit var password: String
-
-    @Inject
-    lateinit var presenter: TwoFAPresenter
-
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidSupportInjection.inject(this)
         super.onCreate(savedInstanceState)
@@ -64,10 +61,27 @@ class TwoFAFragment : Fragment(), TwoFAView {
         }
 
         button_log_in.setOnClickListener {
-            presenter.authenticate(username, password, text_two_factor_auth.textContent)
+            presenter.authenticate(username, password, text_two_factor_auth)
         }
     }
 
+    override fun showLoading() {
+        view_loading.setVisibility(true)
+    }
+
+    override fun hideLoading() {
+        view_loading.setVisibility(false)
+    }
+
+    override fun showMessage(message: String) {
+        Toast.makeText(activity, message, Toast.LENGTH_SHORT).show()
+    }
+
+    override fun shakeView(viewToShake: View) {
+        AnimationHelper.vibrate(viewToShake.context)
+        AnimationHelper.shakeView(viewToShake)
+    }
+
     private fun tintEditTextDrawableStart() {
         activity?.applicationContext?.apply {
             val lockDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_vpn_key_black_24dp, this)
@@ -77,22 +91,4 @@ class TwoFAFragment : Fragment(), TwoFAView {
             DrawableHelper.compoundDrawable(text_two_factor_auth, lockDrawable)
         }
     }
-
-    override fun showLoading() {
-        // TODO - change for a proper progress indicator
-        progress = ProgressDialog.show(activity, "Authenticating",
-                "Verifying user credentials", true, true)
-    }
-
-    override fun hideLoading() {
-        progress?.apply {
-            cancel()
-        }
-        progress = null
-    }
-
-    override fun showMessage(message: String) {
-        // TODO - show a proper error message
-        Toast.makeText(activity, message, Toast.LENGTH_LONG).show()
-    }
 }
\ No newline at end of file