build.gradle

@@ -5,44 +5,50 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 27
-
-
 
+    compileSdkVersion rootProject.ext.compileSdkVersion
     defaultConfig {
-        minSdkVersion 15
-        targetSdkVersion 27
-        versionCode 1
-        versionName "1.0"
-
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-
+        targetSdkVersion rootProject.ext.targetSdkVersion
+        versionName rootProject.ext.versionName
+        versionCode rootProject.ext.versionCode
+        minSdkVersion rootProject.ext.minSdkVersion
     }
 
     buildTypes {
         debug {
             manifestPlaceholders = [isDebug: true]
         }
+
+        debugTest {
+            manifestPlaceholders = [isDebug: true]
+        }
+
         release {
             manifestPlaceholders = [isDebug: false]
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        releaseTest {
+            manifestPlaceholders = [isDebug: false]
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
     // kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    api "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    api 'androidx.appcompat:appcompat:1.1.0'
+    api 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     // Apache validator
-    implementation 'commons-validator:commons-validator:1.6'
+    api 'commons-validator:commons-validator:1.6'
 }

src/main/java/com/kdanmobile/kdanloginregisterui/BaseLoginView.kt

@@ -2,17 +2,18 @@ package com.kdanmobile.kdanloginregisterui
 
 import com.kdanmobile.kdanloginregisterui.Utils.toSpannable
 
-import androidx.constraintlayout.widget.ConstraintLayout
 import android.content.Context
 import android.text.method.LinkMovementMethod
 import android.util.AttributeSet
 import android.view.View
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 
 open abstract class BaseLoginView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     abstract var email: String
     abstract var pwd: String

src/main/java/com/kdanmobile/kdanloginregisterui/BaseRegisterView.kt

@@ -10,9 +10,10 @@ import android.view.View
 import android.widget.TextView
 
 open abstract class BaseRegisterView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     abstract val name: String
     abstract val email: String

src/main/java/com/kdanmobile/kdanloginregisterui/BindAccountView.kt

@@ -9,9 +9,10 @@ import kotlinx.android.synthetic.main.activity_bind_account.view.*
 import org.apache.commons.validator.routines.EmailValidator
 
 class BindAccountView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     var existingEmail: String
         get() = et_bindAccount_existingEmail.text.toString()
@@ -25,6 +26,7 @@ class BindAccountView @JvmOverloads constructor(
     lateinit var onClickConnect: Runnable
     lateinit var onClickCreate: Runnable
     lateinit var onClickBack: Runnable
+
     init {
         View.inflate(context, R.layout.activity_bind_account, this)
         setThirdPtyName("Google")
@@ -40,7 +42,7 @@ class BindAccountView @JvmOverloads constructor(
 
     private fun onClickCreateBtn() {
         val isEmailValid = !TextUtils.isEmpty(newEmail) && EmailValidator.getInstance().isValid(newEmail)
-        et_bindAccount_newEmail.error = when(isEmailValid) {
+        et_bindAccount_newEmail.error = when (isEmailValid) {
             true -> null
             false -> context.getString(R.string.kdanlrui_email_login_register_dialog_email_error)
         }

src/main/java/com/kdanmobile/kdanloginregisterui/LoginAView.kt

@@ -6,19 +6,32 @@ import android.view.View
 import kotlinx.android.synthetic.main.activity_login_a.view.*
 
 class LoginAView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseLoginView(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseLoginView(context, attrs, defStyleAttr) {
 
     override var email: String
-        get() { return emailLoginFromView_loginA.email }
-        set(value) { emailLoginFromView_loginA.email = value }
+        get() {
+            return emailLoginFromView_loginA.email
+        }
+        set(value) {
+            emailLoginFromView_loginA.email = value
+        }
     override var pwd: String
-        get() { return emailLoginFromView_loginA.pwd }
-        set(value) { emailLoginFromView_loginA.pwd = value }
+        get() {
+            return emailLoginFromView_loginA.pwd
+        }
+        set(value) {
+            emailLoginFromView_loginA.pwd = value
+        }
     override var isRemember: Boolean
-        get() { return emailLoginFromView_loginA.isRemember }
-        set(value) { emailLoginFromView_loginA.isRemember = value }
+        get() {
+            return emailLoginFromView_loginA.isRemember
+        }
+        set(value) {
+            emailLoginFromView_loginA.isRemember = value
+        }
 
     init {
         View.inflate(context, R.layout.activity_login_a, this)

src/main/java/com/kdanmobile/kdanloginregisterui/LoginBView.kt

@@ -1,32 +1,45 @@
 package com.kdanmobile.kdanloginregisterui
 
 import android.content.Context
-import androidx.appcompat.app.AlertDialog
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.InputMethodManager
+import androidx.appcompat.app.AlertDialog
 import com.kdanmobile.kdanloginregisterui.widget.EmailLoginFormView
 import kotlinx.android.synthetic.main.activity_login_b.view.*
 
 class LoginBView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseLoginView(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseLoginView(context, attrs, defStyleAttr) {
 
     private val view = LayoutInflater.from(context).inflate(R.layout.dialog_email_login, null)
     private val formView = view.findViewById<EmailLoginFormView>(R.id.formView_emailLoginDialog)
 
     override var email: String
-        get() { return formView.email }
-        set(value) { formView.email = value }
+        get() {
+            return formView.email
+        }
+        set(value) {
+            formView.email = value
+        }
     override var pwd: String
-        get() { return formView.pwd }
-        set(value) { formView.pwd = value }
+        get() {
+            return formView.pwd
+        }
+        set(value) {
+            formView.pwd = value
+        }
     override var isRemember: Boolean
-        get() { return formView.isRemember }
-        set(value) { formView.isRemember = value }
+        get() {
+            return formView.isRemember
+        }
+        set(value) {
+            formView.isRemember = value
+        }
 
     init {
         View.inflate(context, R.layout.activity_login_b, this)
@@ -42,20 +55,21 @@ class LoginBView @JvmOverloads constructor(
         view_loginB_emailLogin.setOnClickListener {
             view_loginB_emailLogin.isEnabled = false
             val dialog = AlertDialog.Builder(context)
-                    .setView(view)
-                    .setOnDismissListener {
-                        val inputMethodManager = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
-                        if (inputMethodManager.isActive) {
-                            inputMethodManager.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0)
-                        }
-                        (view.parent as ViewGroup).removeAllViews()
-                        post{
-                            requestFocus()
-                            inputMethodManager.hideSoftInputFromWindow(windowToken, 0)
-                        }
-                        view_loginB_emailLogin.isEnabled = true
+                .setView(view)
+                .setOnDismissListener {
+                    val inputMethodManager =
+                        context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
+                    if (inputMethodManager.isActive) {
+                        inputMethodManager.toggleSoftInput(InputMethodManager.HIDE_IMPLICIT_ONLY, 0)
                     }
-                    .show()
+                    (view.parent as ViewGroup).removeAllViews()
+                    view_loginB_emailLogin.isEnabled = true
+                    post {
+                        requestFocus()
+                        inputMethodManager.hideSoftInputFromWindow(windowToken, 0)
+                    }
+                }
+                .show()
 
             formView.let {
                 it.isRemember = isRemember

src/main/java/com/kdanmobile/kdanloginregisterui/RegisterAView.kt

@@ -6,9 +6,10 @@ import android.view.View
 import kotlinx.android.synthetic.main.activity_register_a.view.*
 
 class RegisterAView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseRegisterView(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseRegisterView(context, attrs, defStyleAttr) {
 
     override val name: String
         get() = emailRegisterFromView_registerA.name

src/main/java/com/kdanmobile/kdanloginregisterui/RegisterBView.kt

@@ -1,11 +1,11 @@
 package com.kdanmobile.kdanloginregisterui
 
 import android.content.Context
-import androidx.appcompat.app.AlertDialog
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AlertDialog
 import com.kdanmobile.kdanloginregisterui.widget.EmailRegisterFormView
 import kotlinx.android.synthetic.main.activity_register_b.view.*
 

src/main/java/com/kdanmobile/kdanloginregisterui/ResetPwdDialogFragment.kt

@@ -2,17 +2,15 @@ package com.kdanmobile.kdanloginregisterui
 
 import android.content.Context
 import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import androidx.fragment.app.FragmentManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
 import kotlinx.android.synthetic.main.dialog_reset_pwd.*
 import org.apache.commons.validator.routines.EmailValidator
-import java.lang.RuntimeException
 
 class ResetPwdDialogFragment : DialogFragment() {
-
     private var listener: Listener? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
@@ -36,13 +34,13 @@ class ResetPwdDialogFragment : DialogFragment() {
         }
     }
 
-    override fun onAttach(context: Context?) {
+    override fun onAttach(context: Context) {
         super.onAttach(context)
         if (context is Listener) {
             listener = context
         } else {
             if (BuildConfig.DEBUG) {
-                val msg = "${context.toString()} must implement ${ResetPwdDialogFragment.Listener::class.java.name}."
+                val msg = "$context must implement ${ResetPwdDialogFragment.Listener::class.java.name}."
                 throw RuntimeException(msg)
             }
         }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailLoginFormView.kt

@@ -1,36 +1,48 @@
 package com.kdanmobile.kdanloginregisterui.widget
 
-import com.kdanmobile.kdanloginregisterui.Utils.toSpannable
-
 import android.content.Context
-import androidx.constraintlayout.widget.ConstraintLayout
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.view.View
+import android.view.View.OnClickListener
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import com.kdanmobile.kdanloginregisterui.Config
 import com.kdanmobile.kdanloginregisterui.R
+import com.kdanmobile.kdanloginregisterui.Utils.toSpannable
 import kotlinx.android.synthetic.main.view_email_login_form.view.*
-
 import org.apache.commons.validator.routines.EmailValidator
 
 class EmailLoginFormView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     var onSubmit: Runnable? = null
     var onClickPwdHelp: View.OnClickListener? = null
 
     var isRemember: Boolean
-        get() { return cb_emailLogin_rememberMe.isChecked }
-        set(value) { cb_emailLogin_rememberMe.isChecked = value}
+        get() {
+            return cb_emailLogin_rememberMe.isChecked
+        }
+        set(value) {
+            cb_emailLogin_rememberMe.isChecked = value
+        }
     var email: String
-        get() { return et_emailLoginForm_email.text.toString() }
-        set(value) { et_emailLoginForm_email.setText(value, TextView.BufferType.EDITABLE) }
+        get() {
+            return et_emailLoginForm_email.text.toString()
+        }
+        set(value) {
+            et_emailLoginForm_email.setText(value, TextView.BufferType.EDITABLE)
+        }
     var pwd: String
-        get() { return et_emailLoginForm_pwd.text.toString() }
-        set(value) { return et_emailLoginForm_pwd.setText(value, TextView.BufferType.EDITABLE) }
+        get() {
+            return et_emailLoginForm_pwd.text.toString()
+        }
+        set(value) {
+            return et_emailLoginForm_pwd.setText(value, TextView.BufferType.EDITABLE)
+        }
 
     init {
         inflate(getContext(), R.layout.view_email_login_form, this)
@@ -58,7 +70,7 @@ class EmailLoginFormView @JvmOverloads constructor(
         val isUnderLine = true
         val onClick = OnClickListener {} // Cannot work, don't know why.
         val s = tv_emailLogin_pwdHelp.text
-                .toSpannable(textColor, isUnderLine, onClick)
+            .toSpannable(textColor, isUnderLine, onClick)
         tv_emailLogin_pwdHelp.text = s
 
         // The OnClickListener set on spannable is now work,

src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailRegisterFormView.kt

@@ -1,19 +1,19 @@
 package com.kdanmobile.kdanloginregisterui.widget
 
 import android.content.Context
-import androidx.constraintlayout.widget.ConstraintLayout
 import android.text.TextUtils
 import android.util.AttributeSet
 import android.widget.TextView
+import androidx.constraintlayout.widget.ConstraintLayout
 import com.kdanmobile.kdanloginregisterui.R
-
 import kotlinx.android.synthetic.main.view_email_register_form.view.*
 import org.apache.commons.validator.routines.EmailValidator
 
 class EmailRegisterFormView @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     companion object {
         const val PWD_MIN_LENGTH = 8
@@ -21,14 +21,26 @@ class EmailRegisterFormView @JvmOverloads constructor(
 
     var onSubmit: Runnable? = null
     var name: String
-        get() { return et_emailRegisterForm_name.text.toString() }
-        set(value) { et_emailRegisterForm_name.setText(value, TextView.BufferType.EDITABLE) }
+        get() {
+            return et_emailRegisterForm_name.text.toString()
+        }
+        set(value) {
+            et_emailRegisterForm_name.setText(value, TextView.BufferType.EDITABLE)
+        }
     var email: String
-        get() { return et_emailRegisterForm_email.text.toString() }
-        set(value) { et_emailRegisterForm_email.setText(value, TextView.BufferType.EDITABLE) }
+        get() {
+            return et_emailRegisterForm_email.text.toString()
+        }
+        set(value) {
+            et_emailRegisterForm_email.setText(value, TextView.BufferType.EDITABLE)
+        }
     var pwd: String
-        get() { return et_emailRegisterForm_pwd.text.toString() }
-        set(value) { return et_emailRegisterForm_pwd.setText(value, TextView.BufferType.EDITABLE) }
+        get() {
+            return et_emailRegisterForm_pwd.text.toString()
+        }
+        set(value) {
+            return et_emailRegisterForm_pwd.setText(value, TextView.BufferType.EDITABLE)
+        }
 
     init {
         inflate(getContext(), R.layout.view_email_register_form, this)

src/main/java/com/kdanmobile/kdanloginregisterui/widget/PwdEditText.kt

@@ -12,21 +12,22 @@ import com.kdanmobile.kdanloginregisterui.R
 import kotlinx.android.synthetic.main.edit_text_pwd.view.*
 
 class PwdEditText @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
 
     var error: CharSequence?
-    get() = et_pwdEditText_pwd.error
-    set(value) {
-        et_pwdEditText_pwd.error = value
-    }
+        get() = et_pwdEditText_pwd.error
+        set(value) {
+            et_pwdEditText_pwd.error = value
+        }
 
     var text: Editable?
-    get() = et_pwdEditText_pwd.text
-    set(value) {
-        et_pwdEditText_pwd.text = value
-    }
+        get() = et_pwdEditText_pwd.text
+        set(value) {
+            et_pwdEditText_pwd.text = value
+        }
 
     init {
         inflate(getContext(), R.layout.edit_text_pwd, this)

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/BaseEmailBtn.kt

@@ -6,9 +6,10 @@ import android.util.AttributeSet
 import com.kdanmobile.kdanloginregisterui.R
 
 open abstract class BaseEmailBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
     init {
         inflate(getContext(), R.layout.btn_email_login_register, this)
     }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/BaseFacebookBtn.kt

@@ -6,9 +6,10 @@ import android.util.AttributeSet
 import com.kdanmobile.kdanloginregisterui.R
 
 open abstract class BaseFacebookBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
     init {
         inflate(getContext(), R.layout.btn_facebook_login_register, this)
     }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/BaseGoogleBtn.kt

@@ -6,9 +6,10 @@ import android.util.AttributeSet
 import com.kdanmobile.kdanloginregisterui.R
 
 open class BaseGoogleBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : ConstraintLayout(context, attrs, defStyleAttr) {
     init {
         inflate(getContext(), R.layout.btn_google_login_register, this)
     }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/EmailLoginBtn.kt

@@ -6,9 +6,10 @@ import com.kdanmobile.kdanloginregisterui.R
 import kotlinx.android.synthetic.main.btn_email_login_register.view.*
 
 class EmailLoginBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseEmailBtn(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseEmailBtn(context, attrs, defStyleAttr) {
     init {
         tv_emailLoginRegisterBtn_text.setText(R.string.kdanlrui_signIn_email)
     }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/EmailRegisterBtn.kt

@@ -6,9 +6,10 @@ import com.kdanmobile.kdanloginregisterui.R
 import kotlinx.android.synthetic.main.btn_email_login_register.view.*
 
 class EmailRegisterBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseEmailBtn(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseEmailBtn(context, attrs, defStyleAttr) {
     init {
         tv_emailLoginRegisterBtn_text.setText(R.string.kdanlrui_signUp_email)
     }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/FacebookLoginBtn.kt

@@ -6,9 +6,10 @@ import com.kdanmobile.kdanloginregisterui.R
 import kotlinx.android.synthetic.main.btn_facebook_login_register.view.*
 
 class FacebookLoginBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseFacebookBtn(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseFacebookBtn(context, attrs, defStyleAttr) {
     init {
         tv_facebookLoginRegisterBtn_text.setText(R.string.kdanlrui_signIn_facebook)
     }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/FacebookRegisterBtn.kt

@@ -6,9 +6,10 @@ import com.kdanmobile.kdanloginregisterui.R
 import kotlinx.android.synthetic.main.btn_facebook_login_register.view.*
 
 class FacebookRegisterBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseFacebookBtn(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseFacebookBtn(context, attrs, defStyleAttr) {
     init {
         tv_facebookLoginRegisterBtn_text.setText(R.string.kdanlrui_signUp_facebook)
     }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/GoogleLoginBtn.kt

@@ -6,9 +6,10 @@ import com.kdanmobile.kdanloginregisterui.R
 import kotlinx.android.synthetic.main.btn_google_login_register.view.*
 
 class GoogleLoginBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseGoogleBtn(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseGoogleBtn(context, attrs, defStyleAttr) {
     init {
         tv_googleLoginRegisterBtn_text.setText(R.string.kdanlrui_signIn_google)
     }

src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/GoogleRegisterBtn.kt

@@ -6,9 +6,10 @@ import com.kdanmobile.kdanloginregisterui.R
 import kotlinx.android.synthetic.main.btn_google_login_register.view.*
 
 class GoogleRegisterBtn @JvmOverloads constructor(
-        context: Context,
-        attrs: AttributeSet? = null,
-        defStyleAttr: Int = 0) : BaseGoogleBtn(context, attrs, defStyleAttr) {
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : BaseGoogleBtn(context, attrs, defStyleAttr) {
     init {
         tv_googleLoginRegisterBtn_text.setText(R.string.kdanlrui_signUp_google)
     }

src/main/res/layout-land/activity_login_a.xml

@@ -1,141 +1,130 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.LoginAActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_loginA_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_loginA_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_loginA_thirdPtyBtn"
-                android:layout_width="206dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintLeft_toLeftOf="@+id/iv_loginA_kdanCloud"
-                app:layout_constraintRight_toRightOf="@+id/iv_loginA_kdanCloud"
-                />
+                    android:id="@+id/anchor_loginA_thirdPtyBtn"
+                    android:layout_width="206dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="@+id/iv_loginA_kdanCloud"
+                    app:layout_constraintRight_toRightOf="@+id/iv_loginA_kdanCloud"/>
 
             <ImageButton
-                android:id="@+id/btn_loginA_close"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_loginA_close"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_close_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
-                android:id="@+id/iv_loginA_kdanCloud"
-                android:src="@drawable/kdancloud"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="117dp"
-                android:layout_height="78dp"
-                android:layout_marginRight="84dp"
-                android:layout_marginEnd="84dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_loginA_centerHorizontal"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginA_fbLogin"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/iv_loginA_kdanCloud"
+                    app:srcCompat="@drawable/kdancloud"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="117dp"
+                    android:layout_height="78dp"
+                    android:layout_marginRight="84dp"
+                    android:layout_marginEnd="84dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_loginA_centerHorizontal"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginA_fbLogin"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookLoginBtn
-                android:id="@+id/view_loginA_fbLogin"
-                android:layout_width="0dp"
-                android:layout_height="37dp"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@id/iv_loginA_kdanCloud"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginA_googleLogin"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_thirdPtyBtn"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginA_thirdPtyBtn"
-                />
+                    android:id="@+id/view_loginA_fbLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="37dp"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintTop_toBottomOf="@id/iv_loginA_kdanCloud"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginA_googleLogin"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_thirdPtyBtn"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginA_thirdPtyBtn"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleLoginBtn
-                android:id="@+id/view_loginA_googleLogin"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="10dp"
-                app:layout_constraintTop_toBottomOf="@id/view_loginA_fbLogin"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_thirdPtyBtn"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginA_thirdPtyBtn"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/view_loginA_googleLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="10dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginA_fbLogin"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_thirdPtyBtn"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginA_thirdPtyBtn"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.EmailLoginFormView
-                android:id="@+id/emailLoginFromView_loginA"
-                android:layout_width="240dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="28dp"
-                android:layout_marginStart="28dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_loginA_centerHorizontal"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/tv_loginA_tosAndPp"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/emailLoginFromView_loginA"
+                    android:layout_width="240dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="28dp"
+                    android:layout_marginStart="28dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_loginA_centerHorizontal"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/tv_loginA_tosAndPp"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <TextView
-                android:id="@+id/tv_loginA_tosAndPp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
-                android:gravity="center"
-                app:layout_constraintLeft_toLeftOf="@id/emailLoginFromView_loginA"
-                app:layout_constraintRight_toRightOf="@id/emailLoginFromView_loginA"
-                app:layout_constraintTop_toBottomOf="@id/emailLoginFromView_loginA"
-                app:layout_constraintBottom_toBottomOf="parent"
-                tools:text="Terms of service &amp; Privacy policy."
-                />
+                    android:id="@+id/tv_loginA_tosAndPp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
+                    android:gravity="center"
+                    app:layout_constraintLeft_toLeftOf="@id/emailLoginFromView_loginA"
+                    app:layout_constraintRight_toRightOf="@id/emailLoginFromView_loginA"
+                    app:layout_constraintTop_toBottomOf="@id/emailLoginFromView_loginA"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    tools:text="Terms of service &amp; Privacy policy."/>
 
             <androidx.constraintlayout.widget.Barrier
-                android:id="@+id/barrier_loginALand_bottom"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:barrierDirection="bottom"
-                app:constraint_referenced_ids="view_loginA_googleLogin, tv_loginA_tosAndPp"
-                />
+                    android:id="@+id/barrier_loginALand_bottom"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:barrierDirection="bottom"
+                    app:constraint_referenced_ids="view_loginA_googleLogin, tv_loginA_tosAndPp"/>
 
             <TextView
-                android:id="@+id/tv_loginA_switchToRegister"
-                android:text="@string/kdanlrui_switch_to_register"
-                android:textColor="@color/kdanlrui_switch_text"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:gravity="center"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toTopOf="@id/barrier_loginALand_bottom"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/tv_loginA_switchToRegister"
+                    android:text="@string/kdanlrui_switch_to_register"
+                    android:textColor="@color/kdanlrui_switch_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:gravity="center"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintTop_toTopOf="@id/barrier_loginALand_bottom"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>

src/main/res/layout-land/activity_login_b.xml

@@ -1,141 +1,131 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.LoginBActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_loginB_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_loginB_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_loginB_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="19dp"
-                android:layout_marginStart="19dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_loginB_centerHorizontal"
-                />
+                    android:id="@+id/anchor_loginB_left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="19dp"
+                    android:layout_marginStart="19dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_loginB_centerHorizontal"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_loginB_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="225dp"
-                android:layout_marginStart="225dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_loginB_centerHorizontal"
-                />
+                    android:id="@+id/anchor_loginB_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="225dp"
+                    android:layout_marginStart="225dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_loginB_centerHorizontal"/>
 
             <ImageButton
-                android:id="@+id/btn_loginB_close"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_loginB_close"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_close_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
-                android:id="@+id/iv_loginB_kdanCloud"
-                android:src="@drawable/kdancloud"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="117dp"
-                android:layout_height="78dp"
-                android:layout_marginRight="74dp"
-                android:layout_marginEnd="74dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_loginB_centerHorizontal"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/tv_loginB_switchToRegister"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/iv_loginB_kdanCloud"
+                    app:srcCompat="@drawable/kdancloud"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="117dp"
+                    android:layout_height="78dp"
+                    android:layout_marginRight="74dp"
+                    android:layout_marginEnd="74dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_loginB_centerHorizontal"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_loginB_switchToRegister"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <TextView
-                android:id="@+id/tv_loginB_switchToRegister"
-                android:text="@string/kdanlrui_switch_to_register"
-                android:textColor="@color/kdanlrui_switch_text"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:gravity="center"
-                android:layout_marginTop="36dp"
-                app:layout_constraintTop_toBottomOf="@id/iv_loginB_kdanCloud"
-                app:layout_constraintLeft_toLeftOf="@id/iv_loginB_kdanCloud"
-                app:layout_constraintRight_toRightOf="@id/iv_loginB_kdanCloud"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/tv_loginB_switchToRegister"
+                    android:text="@string/kdanlrui_switch_to_register"
+                    android:textColor="@color/kdanlrui_switch_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:gravity="center"
+                    android:layout_marginTop="36dp"
+                    app:layout_constraintTop_toBottomOf="@id/iv_loginB_kdanCloud"
+                    app:layout_constraintLeft_toLeftOf="@id/iv_loginB_kdanCloud"
+                    app:layout_constraintRight_toRightOf="@id/iv_loginB_kdanCloud"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookLoginBtn
-                android:id="@+id/view_loginB_fbLogin"
-                android:layout_width="0dp"
-                android:layout_height="37dp"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginB_googleLogin"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed" />
+                    android:id="@+id/view_loginB_fbLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="37dp"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginB_googleLogin"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleLoginBtn
-                android:id="@+id/view_loginB_googleLogin"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="10dp"
-                app:layout_constraintTop_toBottomOf="@id/view_loginB_fbLogin"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginB_emailLogin"
-                />
+                    android:id="@+id/view_loginB_googleLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="10dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginB_fbLogin"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginB_emailLogin"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.EmailLoginBtn
-                android:id="@+id/view_loginB_emailLogin"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="10dp"
-                app:layout_constraintTop_toBottomOf="@id/view_loginB_googleLogin"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                app:layout_constraintBottom_toTopOf="@+id/tv_loginB_tosAndPp"
-                />
+                    android:id="@+id/view_loginB_emailLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="10dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginB_googleLogin"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_loginB_tosAndPp"/>
 
             <TextView
-                android:id="@+id/tv_loginB_tosAndPp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
-                android:gravity="center"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                app:layout_constraintTop_toBottomOf="@id/view_loginB_emailLogin"
-                tools:text="Our terms of service and privacy policy."
-                />
+                    android:id="@+id/tv_loginB_tosAndPp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
+                    android:gravity="center"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginB_emailLogin"
+                    tools:text="Our terms of service and privacy policy."/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 

src/main/res/layout-land/activity_register_a.xml

@@ -1,157 +1,146 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.RegisterAActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_registerA_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_registerA_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_registerA_thirdPtyBtn"
-                android:layout_width="206dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintLeft_toLeftOf="@+id/iv_registerA_kdanCloud"
-                app:layout_constraintRight_toRightOf="@+id/iv_registerA_kdanCloud"
-                />
+                    android:id="@+id/anchor_registerA_thirdPtyBtn"
+                    android:layout_width="206dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintLeft_toLeftOf="@+id/iv_registerA_kdanCloud"
+                    app:layout_constraintRight_toRightOf="@+id/iv_registerA_kdanCloud"/>
 
             <ImageButton
-                android:id="@+id/btn_registerA_close"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_registerA_close"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_close_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
-                android:id="@+id/iv_registerA_kdanCloud"
-                android:src="@drawable/kdancloud"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="117dp"
-                android:layout_height="78dp"
-                android:layout_marginRight="84dp"
-                android:layout_marginEnd="84dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_registerA_centerHorizontal"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerA_title"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/iv_registerA_kdanCloud"
+                    app:srcCompat="@drawable/kdancloud"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="117dp"
+                    android:layout_height="78dp"
+                    android:layout_marginRight="84dp"
+                    android:layout_marginEnd="84dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_registerA_centerHorizontal"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerA_title"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <TextView
-                android:id="@+id/tv_registerA_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="@string/kdanlrui_register_title"
-                android:textColor="@color/kdanlrui_register_title"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                android:layout_marginTop="4dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_thirdPtyBtn"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_thirdPtyBtn"
-                app:layout_constraintTop_toBottomOf="@id/iv_registerA_kdanCloud"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerA_fbRegister"
-                />
+                    android:id="@+id/tv_registerA_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:text="@string/kdanlrui_register_title"
+                    android:textColor="@color/kdanlrui_register_title"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:layout_marginTop="4dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_thirdPtyBtn"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_thirdPtyBtn"
+                    app:layout_constraintTop_toBottomOf="@id/iv_registerA_kdanCloud"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerA_fbRegister"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookRegisterBtn
-                android:id="@+id/view_registerA_fbRegister"
-                android:layout_width="0dp"
-                android:layout_height="37dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintTop_toBottomOf="@id/tv_registerA_title"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerA_googleRegister"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_thirdPtyBtn"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_thirdPtyBtn"
-                />
+                    android:id="@+id/view_registerA_fbRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="37dp"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintTop_toBottomOf="@id/tv_registerA_title"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerA_googleRegister"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_thirdPtyBtn"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_thirdPtyBtn"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleRegisterBtn
-                android:id="@+id/view_registerA_googleRegister"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="10dp"
-                app:layout_constraintTop_toBottomOf="@id/view_registerA_fbRegister"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_thirdPtyBtn"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_thirdPtyBtn"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/view_registerA_googleRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="10dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerA_fbRegister"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_thirdPtyBtn"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_thirdPtyBtn"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.EmailRegisterFormView
-                android:id="@+id/emailRegisterFromView_registerA"
-                android:layout_width="240dp"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="28dp"
-                android:layout_marginStart="28dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_registerA_centerHorizontal"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@id/tv_registerA_tosAndPp"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/emailRegisterFromView_registerA"
+                    android:layout_width="240dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="28dp"
+                    android:layout_marginStart="28dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_registerA_centerHorizontal"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@id/tv_registerA_tosAndPp"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <TextView
-                android:id="@+id/tv_registerA_tosAndPp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
-                android:gravity="center"
-                app:layout_constraintLeft_toLeftOf="@id/emailRegisterFromView_registerA"
-                app:layout_constraintRight_toRightOf="@id/emailRegisterFromView_registerA"
-                app:layout_constraintTop_toBottomOf="@id/emailRegisterFromView_registerA"
-                app:layout_constraintBottom_toBottomOf="parent"
-                tools:text="Terms of service &amp; Privacy policy."
-                />
+                    android:id="@+id/tv_registerA_tosAndPp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
+                    android:gravity="center"
+                    app:layout_constraintLeft_toLeftOf="@id/emailRegisterFromView_registerA"
+                    app:layout_constraintRight_toRightOf="@id/emailRegisterFromView_registerA"
+                    app:layout_constraintTop_toBottomOf="@id/emailRegisterFromView_registerA"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    tools:text="Terms of service &amp; Privacy policy."/>
 
             <androidx.constraintlayout.widget.Barrier
-                android:id="@+id/barrier_registerALand_bottom"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:barrierDirection="bottom"
-                app:constraint_referenced_ids="view_registerA_googleRegister, tv_registerA_tosAndPp"
-                />
+                    android:id="@+id/barrier_registerALand_bottom"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    app:barrierDirection="bottom"
+                    app:constraint_referenced_ids="view_registerA_googleRegister, tv_registerA_tosAndPp"/>
 
             <TextView
-                android:id="@+id/tv_registerA_switchToLogin"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:gravity="center"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="24dp"
-                android:text="@string/kdanlrui_switch_to_login"
-                android:textColor="@color/kdanlrui_switch_text"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="@id/barrier_registerALand_bottom" />
+                    android:id="@+id/tv_registerA_switchToLogin"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:gravity="center"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="24dp"
+                    android:text="@string/kdanlrui_switch_to_login"
+                    android:textColor="@color/kdanlrui_switch_text"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="@id/barrier_registerALand_bottom"/>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>

src/main/res/layout-land/activity_register_b.xml

@@ -1,157 +1,147 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.RegisterBActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_registerB_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_registerB_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_registerB_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="19dp"
-                android:layout_marginStart="19dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_registerB_centerHorizontal"
-                />
+                    android:id="@+id/anchor_registerB_left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="19dp"
+                    android:layout_marginStart="19dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_registerB_centerHorizontal"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_registerB_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="225dp"
-                android:layout_marginStart="225dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_registerB_centerHorizontal"
-                />
+                    android:id="@+id/anchor_registerB_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="225dp"
+                    android:layout_marginStart="225dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_registerB_centerHorizontal"/>
 
             <ImageButton
-                android:id="@+id/btn_registerB_close"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_registerB_close"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_close_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
-                android:id="@+id/iv_registerB_kdanCloud"
-                android:src="@drawable/kdancloud"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="117dp"
-                android:layout_height="78dp"
-                android:layout_marginRight="74dp"
-                android:layout_marginEnd="74dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_registerB_centerHorizontal"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerB_title"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/iv_registerB_kdanCloud"
+                    app:srcCompat="@drawable/kdancloud"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="117dp"
+                    android:layout_height="78dp"
+                    android:layout_marginRight="74dp"
+                    android:layout_marginEnd="74dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_registerB_centerHorizontal"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerB_title"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <TextView
-                android:id="@+id/tv_registerB_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:gravity="center"
-                android:text="@string/kdanlrui_register_title"
-                android:textColor="@color/kdanlrui_register_title"
-                android:textSize="16sp"
-                android:textStyle="bold"
-                app:layout_constraintLeft_toLeftOf="@id/iv_registerB_kdanCloud"
-                app:layout_constraintRight_toRightOf="@id/iv_registerB_kdanCloud"
-                app:layout_constraintTop_toBottomOf="@id/iv_registerB_kdanCloud"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerB_switchToLogin"
-                app:layout_constraintVertical_chainStyle="packed" />
+                    android:id="@+id/tv_registerB_title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    android:text="@string/kdanlrui_register_title"
+                    android:textColor="@color/kdanlrui_register_title"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    app:layout_constraintLeft_toLeftOf="@id/iv_registerB_kdanCloud"
+                    app:layout_constraintRight_toRightOf="@id/iv_registerB_kdanCloud"
+                    app:layout_constraintTop_toBottomOf="@id/iv_registerB_kdanCloud"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerB_switchToLogin"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <TextView
-                android:id="@+id/tv_registerB_switchToLogin"
-                android:text="@string/kdanlrui_switch_to_login"
-                android:textColor="@color/kdanlrui_switch_text"
-                android:layout_width="wrap_content"
-                android:layout_height="48dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:layout_marginTop="10dp"
-                android:gravity="center"
-                app:layout_constraintTop_toBottomOf="@id/tv_registerB_title"
-                app:layout_constraintLeft_toLeftOf="@id/iv_registerB_kdanCloud"
-                app:layout_constraintRight_toRightOf="@id/iv_registerB_kdanCloud"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/tv_registerB_switchToLogin"
+                    android:text="@string/kdanlrui_switch_to_login"
+                    android:textColor="@color/kdanlrui_switch_text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:layout_marginTop="10dp"
+                    android:gravity="center"
+                    app:layout_constraintTop_toBottomOf="@id/tv_registerB_title"
+                    app:layout_constraintLeft_toLeftOf="@id/iv_registerB_kdanCloud"
+                    app:layout_constraintRight_toRightOf="@id/iv_registerB_kdanCloud"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookRegisterBtn
-                android:id="@+id/view_registerB_fbRegister"
-                android:layout_width="0dp"
-                android:layout_height="37dp"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerB_googleRegister"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed" />
+                    android:id="@+id/view_registerB_fbRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="37dp"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerB_googleRegister"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleRegisterBtn
-                android:id="@+id/view_registerB_googleRegister"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="10dp"
-                app:layout_constraintTop_toBottomOf="@id/view_registerB_fbRegister"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerB_emailRegister"
-                />
+                    android:id="@+id/view_registerB_googleRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="10dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerB_fbRegister"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerB_emailRegister"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.EmailRegisterBtn
-                android:id="@+id/view_registerB_emailRegister"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="10dp"
-                app:layout_constraintTop_toBottomOf="@id/view_registerB_googleRegister"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerB_tosAndPp"
-                />
+                    android:id="@+id/view_registerB_emailRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="10dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerB_googleRegister"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerB_tosAndPp"/>
 
             <TextView
-                android:id="@+id/tv_registerB_tosAndPp"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
-                android:gravity="center"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintTop_toBottomOf="@id/view_registerB_emailRegister"
-                tools:text="By signing up, you agree to our terms of service and that you have read our privacy policy."
-                />
+                    android:id="@+id/tv_registerB_tosAndPp"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
+                    android:gravity="center"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerB_emailRegister"
+                    tools:text="By signing up, you agree to our terms of service and that you have read our privacy policy."/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 

src/main/res/layout/activity_bind_account.xml

@@ -1,215 +1,199 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.BindAccountActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_bindAccount_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_bindAccount_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_bindAccount_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="136dp"
-                android:layout_marginEnd="136dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_bindAccount_centerHorizontal"
-                />
+                    android:id="@+id/anchor_bindAccount_left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="136dp"
+                    android:layout_marginEnd="136dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_bindAccount_centerHorizontal"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_bindAccount_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="136dp"
-                android:layout_marginStart="136dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_bindAccount_centerHorizontal"
-                />
+                    android:id="@+id/anchor_bindAccount_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="136dp"
+                    android:layout_marginStart="136dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_bindAccount_centerHorizontal"/>
 
             <ImageButton
-                android:id="@+id/btn_bindAccount_back"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_arrow_back_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_bindAccount_back"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_arrow_back_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
-                android:id="@+id/tv_bindAccount_createNew"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                android:gravity="center_vertical|left"
-                android:text="@string/kdanlrui_bind_account_create_new_text"
-                app:layout_constraintBottom_toTopOf="@id/et_bindAccount_newEmail"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed" />
+                    android:id="@+id/tv_bindAccount_createNew"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    android:gravity="center_vertical|left"
+                    android:text="@string/kdanlrui_bind_account_create_new_text"
+                    app:layout_constraintBottom_toTopOf="@id/et_bindAccount_newEmail"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <EditText
-                android:id="@+id/et_bindAccount_newEmail"
-                style="@style/EmailLoginRegisterFormEditText"
-                android:inputType="textEmailAddress"
-                android:hint="@string/kdanlrui_email_input_hint"
-                android:layout_width="0dp"
-                android:layout_height="44dp"
-                android:layout_marginTop="12dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                app:layout_constraintTop_toBottomOf="@id/tv_bindAccount_createNew"
-                app:layout_constraintBottom_toTopOf="@+id/btn_bindAccount_create"
-                />
+                    android:id="@+id/et_bindAccount_newEmail"
+                    style="@style/EmailLoginRegisterFormEditText"
+                    android:inputType="textEmailAddress"
+                    android:hint="@string/kdanlrui_email_input_hint"
+                    android:layout_width="0dp"
+                    android:layout_height="44dp"
+                    android:layout_marginTop="12dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
+                    app:layout_constraintTop_toBottomOf="@id/tv_bindAccount_createNew"
+                    app:layout_constraintBottom_toTopOf="@+id/btn_bindAccount_create"/>
 
             <Button
-                android:id="@+id/btn_bindAccount_create"
-                android:text="@string/kdanlrui_bind_account_create_new_btn"
-                android:textSize="14sp"
-                android:textColor="@android:color/white"
-                android:background="@drawable/bg_bind_account_create_btn"
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                app:layout_constraintTop_toBottomOf="@id/et_bindAccount_newEmail"
-                app:layout_constraintBottom_toTopOf="@id/tv_bindAccount_orDivider"
-                />
+                    android:id="@+id/btn_bindAccount_create"
+                    android:text="@string/kdanlrui_bind_account_create_new_btn"
+                    android:textSize="14sp"
+                    android:textColor="@android:color/white"
+                    android:background="@drawable/bg_bind_account_create_btn"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
+                    app:layout_constraintTop_toBottomOf="@id/et_bindAccount_newEmail"
+                    app:layout_constraintBottom_toTopOf="@id/tv_bindAccount_orDivider"/>
 
             <TextView
-                android:id="@+id/tv_bindAccount_orDivider"
-                android:text="@string/kdanlrui_or"
-                android:textSize="@dimen/kdanlrui_or_divider_text_size"
-                android:textColor="@color/kdanlrui_or_diver"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                app:layout_constraintTop_toBottomOf="@id/btn_bindAccount_create"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/tv_bindAccount_bind"
-                />
+                    android:id="@+id/tv_bindAccount_orDivider"
+                    android:text="@string/kdanlrui_or"
+                    android:textSize="@dimen/kdanlrui_or_divider_text_size"
+                    android:textColor="@color/kdanlrui_or_diver"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    app:layout_constraintTop_toBottomOf="@id/btn_bindAccount_create"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_bindAccount_bind"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_bindAccount_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_bindAccount_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toLeftOf="@id/tv_bindAccount_orDivider"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_bindAccount_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_bindAccount_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toLeftOf="@id/tv_bindAccount_orDivider"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_bindAccount_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_bindAccount_orDivider"
-                app:layout_constraintLeft_toRightOf="@id/tv_bindAccount_orDivider"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_bindAccount_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_bindAccount_orDivider"
+                    app:layout_constraintLeft_toRightOf="@id/tv_bindAccount_orDivider"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"/>
 
             <TextView
-                android:id="@+id/tv_bindAccount_bind"
-                android:text="@string/kdanlrui_bind_account_bind_text"
-                android:gravity="center_vertical|left"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                app:layout_constraintTop_toBottomOf="@id/tv_bindAccount_orDivider"
-                app:layout_constraintBottom_toTopOf="@id/et_bindAccount_existingEmail"
-                />
+                    android:id="@+id/tv_bindAccount_bind"
+                    android:text="@string/kdanlrui_bind_account_bind_text"
+                    android:gravity="center_vertical|left"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="20dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
+                    app:layout_constraintTop_toBottomOf="@id/tv_bindAccount_orDivider"
+                    app:layout_constraintBottom_toTopOf="@id/et_bindAccount_existingEmail"/>
 
             <EditText
-                android:id="@+id/et_bindAccount_existingEmail"
-                style="@style/EmailLoginRegisterFormEditText"
-                android:inputType="textEmailAddress"
-                android:hint="@string/kdanlrui_email_input_hint"
-                android:layout_width="0dp"
-                android:layout_height="44dp"
-                android:layout_marginTop="12dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                app:layout_constraintTop_toBottomOf="@id/tv_bindAccount_bind"
-                app:layout_constraintBottom_toTopOf="@+id/et_bindAccount_existingPwd"
-                />
+                    android:id="@+id/et_bindAccount_existingEmail"
+                    style="@style/EmailLoginRegisterFormEditText"
+                    android:inputType="textEmailAddress"
+                    android:hint="@string/kdanlrui_email_input_hint"
+                    android:layout_width="0dp"
+                    android:layout_height="44dp"
+                    android:layout_marginTop="12dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
+                    app:layout_constraintTop_toBottomOf="@id/tv_bindAccount_bind"
+                    app:layout_constraintBottom_toTopOf="@+id/et_bindAccount_existingPwd"/>
 
             <EditText
-                android:id="@+id/et_bindAccount_existingPwd"
-                style="@style/EmailLoginRegisterFormEditText"
-                android:inputType="textPassword"
-                android:hint="@string/kdanlrui_pwd_input_hint"
-                android:layout_width="0dp"
-                android:layout_height="44dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                app:layout_constraintTop_toBottomOf="@id/et_bindAccount_existingEmail"
-                app:layout_constraintBottom_toTopOf="@id/btn_bindAccount_bind"
-                />
+                    android:id="@+id/et_bindAccount_existingPwd"
+                    style="@style/EmailLoginRegisterFormEditText"
+                    android:inputType="textPassword"
+                    android:hint="@string/kdanlrui_pwd_input_hint"
+                    android:layout_width="0dp"
+                    android:layout_height="44dp"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
+                    app:layout_constraintTop_toBottomOf="@id/et_bindAccount_existingEmail"
+                    app:layout_constraintBottom_toTopOf="@id/btn_bindAccount_bind"/>
 
             <Button
-                android:id="@+id/btn_bindAccount_bind"
-                android:text="@string/kdanlrui_bind_account_bind_btn"
-                android:textSize="14sp"
-                android:textColor="@android:color/white"
-                android:background="@drawable/bg_bind_account_bind_btn"
-                android:layout_width="0dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="8dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                app:layout_constraintTop_toBottomOf="@id/et_bindAccount_existingPwd"
-                app:layout_constraintBottom_toTopOf="@id/tv_bindAccount_bindExplanation"
-                />
+                    android:id="@+id/btn_bindAccount_bind"
+                    android:text="@string/kdanlrui_bind_account_bind_btn"
+                    android:textSize="14sp"
+                    android:textColor="@android:color/white"
+                    android:background="@drawable/bg_bind_account_bind_btn"
+                    android:layout_width="0dp"
+                    android:layout_height="40dp"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
+                    app:layout_constraintTop_toBottomOf="@id/et_bindAccount_existingPwd"
+                    app:layout_constraintBottom_toTopOf="@id/tv_bindAccount_bindExplanation"/>
 
             <TextView
-                android:visibility="gone"
-                android:id="@+id/tv_bindAccount_bindExplanation"
-                android:text="@string/kdanlrui_bind_account_bind_explanation"
-                android:gravity="center_vertical|left"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                android:layout_marginBottom="24dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
-                app:layout_constraintTop_toBottomOf="@id/btn_bindAccount_bind"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:visibility="gone"
+                    android:id="@+id/tv_bindAccount_bindExplanation"
+                    android:text="@string/kdanlrui_bind_account_bind_explanation"
+                    android:gravity="center_vertical|left"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:layout_marginBottom="24dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_bindAccount_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_bindAccount_right"
+                    app:layout_constraintTop_toBottomOf="@id/btn_bindAccount_bind"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/activity_login_a.xml

@@ -1,179 +1,166 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.LoginAActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_loginA_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_loginA_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_loginA_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="136dp"
-                android:layout_marginEnd="136dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_loginA_centerHorizontal"
-                />
+                    android:id="@+id/anchor_loginA_left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="136dp"
+                    android:layout_marginEnd="136dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_loginA_centerHorizontal"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_loginA_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="136dp"
-                android:layout_marginStart="136dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_loginA_centerHorizontal"
-                />
+                    android:id="@+id/anchor_loginA_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="136dp"
+                    android:layout_marginStart="136dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_loginA_centerHorizontal"/>
 
             <ImageButton
-                android:id="@+id/btn_loginA_close"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_loginA_close"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_close_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
-                android:id="@+id/iv_loginA_kdanCloud"
-                android:src="@drawable/kdancloud"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="116dp"
-                android:layout_height="77dp"
-                android:layout_marginTop="48dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/emailLoginFromView_loginA"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/iv_loginA_kdanCloud"
+                    app:srcCompat="@drawable/kdancloud"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="116dp"
+                    android:layout_height="77dp"
+                    android:layout_marginTop="48dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/emailLoginFromView_loginA"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.EmailLoginFormView
-                android:id="@+id/emailLoginFromView_loginA"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="36dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
-                app:layout_constraintTop_toBottomOf="@id/iv_loginA_kdanCloud"
-                app:layout_constraintBottom_toTopOf="@+id/tv_loginA_orDivider"
-                />
+                    android:id="@+id/emailLoginFromView_loginA"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="36dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
+                    app:layout_constraintTop_toBottomOf="@id/iv_loginA_kdanCloud"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_loginA_orDivider"/>
 
             <TextView
-                android:id="@+id/tv_loginA_orDivider"
-                android:text="@string/kdanlrui_or"
-                android:textSize="@dimen/kdanlrui_or_divider_text_size"
-                android:textColor="@color/kdanlrui_or_diver"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
-                app:layout_constraintTop_toBottomOf="@id/emailLoginFromView_loginA"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginA_fbLogin"
-                />
+                    android:id="@+id/tv_loginA_orDivider"
+                    android:text="@string/kdanlrui_or"
+                    android:textSize="@dimen/kdanlrui_or_divider_text_size"
+                    android:textColor="@color/kdanlrui_or_diver"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="24dp"
+                    app:layout_constraintTop_toBottomOf="@id/emailLoginFromView_loginA"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginA_fbLogin"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_loginA_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_loginA_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
-                app:layout_constraintRight_toLeftOf="@id/tv_loginA_orDivider"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_loginA_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_loginA_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
+                    app:layout_constraintRight_toLeftOf="@id/tv_loginA_orDivider"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_loginA_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_loginA_orDivider"
-                app:layout_constraintLeft_toRightOf="@id/tv_loginA_orDivider"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_loginA_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_loginA_orDivider"
+                    app:layout_constraintLeft_toRightOf="@id/tv_loginA_orDivider"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookLoginBtn
-                android:id="@+id/view_loginA_fbLogin"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="24dp"
-                app:layout_constraintTop_toBottomOf="@id/tv_loginA_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginA_googleLogin"
-                />
+                    android:id="@+id/view_loginA_fbLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="24dp"
+                    app:layout_constraintTop_toBottomOf="@id/tv_loginA_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginA_googleLogin"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleLoginBtn
-                android:id="@+id/view_loginA_googleLogin"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="12dp"
-                app:layout_constraintTop_toBottomOf="@id/view_loginA_fbLogin"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
-                app:layout_constraintBottom_toTopOf="@+id/tv_loginA_switchToRegister"
-                />
+                    android:id="@+id/view_loginA_googleLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="12dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginA_fbLogin"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_loginA_switchToRegister"/>
 
             <TextView
-                android:id="@+id/tv_loginA_switchToRegister"
-                android:layout_width="0dp"
-                android:layout_height="48dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:layout_marginTop="32dp"
-                android:text="@string/kdanlrui_switch_to_register"
-                android:textColor="@color/kdanlrui_switch_text"
-                android:gravity="center"
-                app:layout_constraintBottom_toTopOf="@+id/tv_loginA_tosAndPp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
-                app:layout_constraintTop_toBottomOf="@id/view_loginA_googleLogin" />
+                    android:id="@+id/tv_loginA_switchToRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:layout_marginTop="32dp"
+                    android:text="@string/kdanlrui_switch_to_register"
+                    android:textColor="@color/kdanlrui_switch_text"
+                    android:gravity="center"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_loginA_tosAndPp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginA_right"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginA_googleLogin"/>
 
             <TextView
-                android:id="@+id/tv_loginA_tosAndPp"
-                tools:text="Our terms of service and privacy policy."
-                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginBottom="20dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_loginA_switchToRegister"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/tv_loginA_tosAndPp"
+                    tools:text="Our terms of service and privacy policy."
+                    android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginBottom="20dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_loginA_switchToRegister"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 

src/main/res/layout/activity_login_b.xml

@@ -1,179 +1,166 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.LoginBActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_loginB_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_loginB_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_loginB_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="136dp"
-                android:layout_marginEnd="136dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_loginB_centerHorizontal"
-                />
+                    android:id="@+id/anchor_loginB_left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="136dp"
+                    android:layout_marginEnd="136dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_loginB_centerHorizontal"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_loginB_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="136dp"
-                android:layout_marginStart="136dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_loginB_centerHorizontal"
-                />
+                    android:id="@+id/anchor_loginB_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="136dp"
+                    android:layout_marginStart="136dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_loginB_centerHorizontal"/>
 
             <ImageButton
-                android:id="@+id/btn_loginB_close"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_loginB_close"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_close_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
-                android:id="@+id/iv_loginB_kdanCloud"
-                android:src="@drawable/kdancloud"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="116dp"
-                android:layout_height="77dp"
-                android:layout_marginTop="70dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginB_fbLogin"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/iv_loginB_kdanCloud"
+                    app:srcCompat="@drawable/kdancloud"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="116dp"
+                    android:layout_height="77dp"
+                    android:layout_marginTop="70dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginB_fbLogin"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookLoginBtn
-                android:id="@+id/view_loginB_fbLogin"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="40dp"
-                app:layout_constraintTop_toBottomOf="@id/iv_loginB_kdanCloud"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginB_googleLogin"
-                />
+                    android:id="@+id/view_loginB_fbLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="40dp"
+                    app:layout_constraintTop_toBottomOf="@id/iv_loginB_kdanCloud"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginB_googleLogin"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleLoginBtn
-                android:id="@+id/view_loginB_googleLogin"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="10dp"
-                app:layout_constraintTop_toBottomOf="@id/view_loginB_fbLogin"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                app:layout_constraintBottom_toTopOf="@+id/tv_loginB_orDivider"
-                />
+                    android:id="@+id/view_loginB_googleLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="10dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginB_fbLogin"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_loginB_orDivider"/>
 
             <TextView
-                android:id="@+id/tv_loginB_orDivider"
-                android:text="@string/kdanlrui_or"
-                android:textSize="@dimen/kdanlrui_or_divider_text_size"
-                android:textColor="@color/kdanlrui_or_diver"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                app:layout_constraintTop_toBottomOf="@id/view_loginB_googleLogin"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/view_loginB_emailLogin"
-                />
+                    android:id="@+id/tv_loginB_orDivider"
+                    android:text="@string/kdanlrui_or"
+                    android:textSize="@dimen/kdanlrui_or_divider_text_size"
+                    android:textColor="@color/kdanlrui_or_diver"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginB_googleLogin"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/view_loginB_emailLogin"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_loginB_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_loginB_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toLeftOf="@id/tv_loginB_orDivider"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_loginB_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_loginB_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toLeftOf="@id/tv_loginB_orDivider"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_loginB_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_loginB_orDivider"
-                app:layout_constraintLeft_toRightOf="@id/tv_loginB_orDivider"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_loginB_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_loginB_orDivider"
+                    app:layout_constraintLeft_toRightOf="@id/tv_loginB_orDivider"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.EmailLoginBtn
-                android:id="@+id/view_loginB_emailLogin"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="30dp"
-                app:layout_constraintTop_toBottomOf="@id/tv_loginB_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                app:layout_constraintBottom_toTopOf="@+id/tv_loginB_switchToRegister"
-                />
+                    android:id="@+id/view_loginB_emailLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="30dp"
+                    app:layout_constraintTop_toBottomOf="@id/tv_loginB_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_loginB_switchToRegister"/>
 
             <TextView
-                android:id="@+id/tv_loginB_switchToRegister"
-                android:layout_width="0dp"
-                android:layout_height="48dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:layout_marginTop="20dp"
-                android:text="@string/kdanlrui_switch_to_register"
-                android:textColor="@color/kdanlrui_switch_text"
-                android:gravity="center"
-                app:layout_constraintBottom_toTopOf="@+id/tv_loginB_tosAndPp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
-                app:layout_constraintTop_toBottomOf="@id/view_loginB_emailLogin" />
+                    android:id="@+id/tv_loginB_switchToRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:layout_marginTop="20dp"
+                    android:text="@string/kdanlrui_switch_to_register"
+                    android:textColor="@color/kdanlrui_switch_text"
+                    android:gravity="center"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_loginB_tosAndPp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_loginB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_loginB_right"
+                    app:layout_constraintTop_toBottomOf="@id/view_loginB_emailLogin"/>
 
             <TextView
-                android:id="@+id/tv_loginB_tosAndPp"
-                tools:text="Our terms of service and privacy policy."
-                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="134dp"
-                android:layout_marginBottom="20dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tv_loginB_switchToRegister"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/tv_loginB_tosAndPp"
+                    tools:text="Our terms of service and privacy policy."
+                    android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="134dp"
+                    android:layout_marginBottom="20dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/tv_loginB_switchToRegister"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 

src/main/res/layout/activity_register_a.xml

@@ -1,180 +1,167 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.RegisterAActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_registerA_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_registerA_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_registerA_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="136dp"
-                android:layout_marginEnd="136dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_registerA_centerHorizontal"
-                />
+                    android:id="@+id/anchor_registerA_left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="136dp"
+                    android:layout_marginEnd="136dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_registerA_centerHorizontal"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_registerA_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="136dp"
-                android:layout_marginStart="136dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_registerA_centerHorizontal"
-                />
+                    android:id="@+id/anchor_registerA_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="136dp"
+                    android:layout_marginStart="136dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_registerA_centerHorizontal"/>
 
             <ImageButton
-                android:id="@+id/btn_registerA_close"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_registerA_close"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_close_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <ImageView
-                android:id="@+id/iv_registerA_kdanCloud"
-                android:src="@drawable/kdancloud"
-                android:scaleType="centerCrop"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="116dp"
-                android:layout_height="77dp"
-                android:layout_marginTop="48dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/emailRegisterFromView_registerA"
-                app:layout_constraintVertical_chainStyle="packed"
-                />
+                    android:id="@+id/iv_registerA_kdanCloud"
+                    app:srcCompat="@drawable/kdancloud"
+                    android:scaleType="centerCrop"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="116dp"
+                    android:layout_height="77dp"
+                    android:layout_marginTop="48dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/emailRegisterFromView_registerA"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.EmailRegisterFormView
-                android:id="@+id/emailRegisterFromView_registerA"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="36dp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
-                app:layout_constraintTop_toBottomOf="@id/iv_registerA_kdanCloud"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerA_orDivider"
-                />
+                    android:id="@+id/emailRegisterFromView_registerA"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="36dp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
+                    app:layout_constraintTop_toBottomOf="@id/iv_registerA_kdanCloud"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerA_orDivider"/>
 
             <TextView
-                android:id="@+id/tv_registerA_orDivider"
-                android:text="@string/kdanlrui_or"
-                android:textSize="@dimen/kdanlrui_or_divider_text_size"
-                android:textColor="@color/kdanlrui_or_diver"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@id/emailRegisterFromView_registerA"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerA_fbRegister"
-                />
+                    android:id="@+id/tv_registerA_orDivider"
+                    android:text="@string/kdanlrui_or"
+                    android:textSize="@dimen/kdanlrui_or_divider_text_size"
+                    android:textColor="@color/kdanlrui_or_diver"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintTop_toBottomOf="@id/emailRegisterFromView_registerA"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerA_fbRegister"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_registerA_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_registerA_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
-                app:layout_constraintRight_toLeftOf="@id/tv_registerA_orDivider"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_registerA_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_registerA_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
+                    app:layout_constraintRight_toLeftOf="@id/tv_registerA_orDivider"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_registerA_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_registerA_orDivider"
-                app:layout_constraintLeft_toRightOf="@id/tv_registerA_orDivider"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_registerA_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_registerA_orDivider"
+                    app:layout_constraintLeft_toRightOf="@id/tv_registerA_orDivider"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookRegisterBtn
-                android:id="@+id/view_registerA_fbRegister"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="16dp"
-                app:layout_constraintTop_toBottomOf="@id/tv_registerA_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerA_googleRegister"
-                />
+                    android:id="@+id/view_registerA_fbRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintTop_toBottomOf="@id/tv_registerA_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerA_googleRegister"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleRegisterBtn
-                android:id="@+id/view_registerA_googleRegister"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="8dp"
-                app:layout_constraintTop_toBottomOf="@id/view_registerA_fbRegister"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerA_switchToLogin"
-                />
+                    android:id="@+id/view_registerA_googleRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerA_fbRegister"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerA_switchToLogin"/>
 
             <TextView
-                android:id="@+id/tv_registerA_switchToLogin"
-                android:layout_width="0dp"
-                android:layout_height="48dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:layout_marginTop="32dp"
-                android:text="@string/kdanlrui_switch_to_login"
-                android:textColor="@color/kdanlrui_switch_text"
-                android:gravity="center"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerA_tosAndPp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
-                app:layout_constraintTop_toBottomOf="@id/view_registerA_googleRegister" />
+                    android:id="@+id/tv_registerA_switchToLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:layout_marginTop="32dp"
+                    android:text="@string/kdanlrui_switch_to_login"
+                    android:textColor="@color/kdanlrui_switch_text"
+                    android:gravity="center"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerA_tosAndPp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerA_googleRegister"/>
 
             <TextView
-                android:id="@+id/tv_registerA_tosAndPp"
-                tools:text="Our terms of service and privacy policy."
-                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
-                android:layout_marginBottom="20dp"
-                android:gravity="center"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
-                app:layout_constraintTop_toBottomOf="@id/tv_registerA_switchToLogin"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/tv_registerA_tosAndPp"
+                    tools:text="Our terms of service and privacy policy."
+                    android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="32dp"
+                    android:layout_marginBottom="20dp"
+                    android:gravity="center"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerA_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerA_right"
+                    app:layout_constraintTop_toBottomOf="@id/tv_registerA_switchToLogin"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 

src/main/res/layout/activity_register_b.xml

@@ -1,181 +1,169 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".screen.RegisterBActivity">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <ScrollView
-        android:fillViewport="true"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        >
+            android:fillViewport="true"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent">
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
             <androidx.constraintlayout.widget.Guideline
-                android:id="@+id/guideLine_registerB_centerHorizontal"
-                android:orientation="vertical"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                app:layout_constraintGuide_percent="0.5"
-                />
+                    android:id="@+id/guideLine_registerB_centerHorizontal"
+                    android:orientation="vertical"
+                    android:layout_width="0dp"
+                    android:layout_height="0dp"
+                    app:layout_constraintGuide_percent="0.5"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_registerB_left"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginRight="136dp"
-                android:layout_marginEnd="136dp"
-                app:layout_constraintRight_toRightOf="@id/guideLine_registerB_centerHorizontal"
-                />
+                    android:id="@+id/anchor_registerB_left"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginRight="136dp"
+                    android:layout_marginEnd="136dp"
+                    app:layout_constraintRight_toRightOf="@id/guideLine_registerB_centerHorizontal"/>
 
             <android.widget.Space
-                android:id="@+id/anchor_registerB_right"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="136dp"
-                android:layout_marginStart="136dp"
-                app:layout_constraintLeft_toLeftOf="@id/guideLine_registerB_centerHorizontal"
-                />
+                    android:id="@+id/anchor_registerB_right"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="136dp"
+                    android:layout_marginStart="136dp"
+                    app:layout_constraintLeft_toLeftOf="@id/guideLine_registerB_centerHorizontal"/>
 
             <ImageButton
-                android:id="@+id/btn_registerB_close"
-                android:background="?android:attr/selectableItemBackground"
-                android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginTop="4dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                />
+                    android:id="@+id/btn_registerB_close"
+                    android:background="?android:attr/selectableItemBackground"
+                    app:srcCompat="@drawable/ic_close_blue_24dp"
+                    android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"/>
 
             <TextView
-                android:id="@+id/tv_registerB_title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="96dp"
-                android:gravity="center"
-                android:text="@string/kdanlrui_register_title"
-                android:textColor="@color/kdanlrui_register_title"
-                android:textSize="24sp"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerB_fbRegister"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed" />
+                    android:id="@+id/tv_registerB_title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="96dp"
+                    android:gravity="center"
+                    android:text="@string/kdanlrui_register_title"
+                    android:textColor="@color/kdanlrui_register_title"
+                    android:textSize="24sp"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerB_fbRegister"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintVertical_chainStyle="packed"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookRegisterBtn
-                android:id="@+id/view_registerB_fbRegister"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="66dp"
-                app:layout_constraintTop_toBottomOf="@id/tv_registerB_title"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerB_googleRegister"
-                />
+                    android:id="@+id/view_registerB_fbRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="66dp"
+                    app:layout_constraintTop_toBottomOf="@id/tv_registerB_title"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerB_googleRegister"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleRegisterBtn
-                android:id="@+id/view_registerB_googleRegister"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="10dp"
-                app:layout_constraintTop_toBottomOf="@id/view_registerB_fbRegister"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerB_orDivider"
-                />
+                    android:id="@+id/view_registerB_googleRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="10dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerB_fbRegister"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerB_orDivider"/>
 
             <TextView
-                android:id="@+id/tv_registerB_orDivider"
-                android:text="@string/kdanlrui_or"
-                android:textSize="@dimen/kdanlrui_or_divider_text_size"
-                android:textColor="@color/kdanlrui_or_diver"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="30dp"
-                app:layout_constraintTop_toBottomOf="@id/view_registerB_googleRegister"
-                app:layout_constraintLeft_toLeftOf="parent"
-                app:layout_constraintRight_toRightOf="parent"
-                app:layout_constraintBottom_toTopOf="@+id/view_registerB_emailRegister"
-                />
+                    android:id="@+id/tv_registerB_orDivider"
+                    android:text="@string/kdanlrui_or"
+                    android:textSize="@dimen/kdanlrui_or_divider_text_size"
+                    android:textColor="@color/kdanlrui_or_diver"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="30dp"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerB_googleRegister"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"
+                    app:layout_constraintBottom_toTopOf="@+id/view_registerB_emailRegister"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginRight="16dp"
-                android:layout_marginEnd="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_registerB_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_registerB_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toLeftOf="@id/tv_registerB_orDivider"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginRight="16dp"
+                    android:layout_marginEnd="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_registerB_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_registerB_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toLeftOf="@id/tv_registerB_orDivider"/>
 
             <View
-                android:background="@color/kdanlrui_or_diver"
-                android:layout_width="0dp"
-                android:layout_height="1dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginStart="16dp"
-                app:layout_constraintTop_toTopOf="@id/tv_registerB_orDivider"
-                app:layout_constraintBottom_toBottomOf="@id/tv_registerB_orDivider"
-                app:layout_constraintLeft_toRightOf="@id/tv_registerB_orDivider"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                />
+                    android:background="@color/kdanlrui_or_diver"
+                    android:layout_width="0dp"
+                    android:layout_height="1dp"
+                    android:layout_marginLeft="16dp"
+                    android:layout_marginStart="16dp"
+                    app:layout_constraintTop_toTopOf="@id/tv_registerB_orDivider"
+                    app:layout_constraintBottom_toBottomOf="@id/tv_registerB_orDivider"
+                    app:layout_constraintLeft_toRightOf="@id/tv_registerB_orDivider"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"/>
 
             <com.kdanmobile.kdanloginregisterui.widget.btn.EmailRegisterBtn
-                android:id="@+id/view_registerB_emailRegister"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-                android:layout_marginTop="30dp"
-                app:layout_constraintTop_toBottomOf="@id/tv_registerB_orDivider"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerB_switchToLogin"
-                />
+                    android:id="@+id/view_registerB_emailRegister"
+                    android:layout_width="0dp"
+                    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+                    android:layout_marginTop="30dp"
+                    app:layout_constraintTop_toBottomOf="@id/tv_registerB_orDivider"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerB_switchToLogin"/>
 
             <TextView
-                android:id="@+id/tv_registerB_switchToLogin"
-                android:layout_width="0dp"
-                android:layout_height="48dp"
-                android:paddingLeft="8dp"
-                android:paddingRight="8dp"
-                android:layout_marginTop="20dp"
-                android:text="@string/kdanlrui_switch_to_login"
-                android:textColor="@color/kdanlrui_switch_text"
-                android:gravity="center"
-                app:layout_constraintBottom_toTopOf="@+id/tv_registerB_tosAndPp"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintTop_toBottomOf="@id/view_registerB_emailRegister" />
+                    android:id="@+id/tv_registerB_switchToLogin"
+                    android:layout_width="0dp"
+                    android:layout_height="48dp"
+                    android:paddingLeft="8dp"
+                    android:paddingRight="8dp"
+                    android:layout_marginTop="20dp"
+                    android:text="@string/kdanlrui_switch_to_login"
+                    android:textColor="@color/kdanlrui_switch_text"
+                    android:gravity="center"
+                    app:layout_constraintBottom_toTopOf="@+id/tv_registerB_tosAndPp"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintTop_toBottomOf="@id/view_registerB_emailRegister"/>
 
             <TextView
-                android:id="@+id/tv_registerB_tosAndPp"
-                tools:text="By signing up, you agree to our terms of service and that you have read our privacy policy."
-                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="134dp"
-                android:layout_marginBottom="20dp"
-                android:gravity="center"
-                app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
-                app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
-                app:layout_constraintTop_toBottomOf="@id/tv_registerB_switchToLogin"
-                app:layout_constraintBottom_toBottomOf="parent"
-                />
+                    android:id="@+id/tv_registerB_tosAndPp"
+                    tools:text="By signing up, you agree to our terms of service and that you have read our privacy policy."
+                    android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="134dp"
+                    android:layout_marginBottom="20dp"
+                    android:gravity="center"
+                    app:layout_constraintLeft_toLeftOf="@id/anchor_registerB_left"
+                    app:layout_constraintRight_toRightOf="@id/anchor_registerB_right"
+                    app:layout_constraintTop_toBottomOf="@id/tv_registerB_switchToLogin"
+                    app:layout_constraintBottom_toBottomOf="parent"/>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </ScrollView>
 

src/main/res/layout/btn_email_login_register.xml

@@ -1,38 +1,35 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-    android:foreground="?attr/selectableItemBackground"
-    android:background="@drawable/bg_email_btn"
-    >
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+        android:foreground="?attr/selectableItemBackground"
+        android:background="@drawable/bg_email_btn">
 
     <ImageView
-        android:id="@+id/iv_emailLoginRegisterBtn_ic"
-        android:src="@drawable/btn_icon_mail"
-        android:scaleType="center"
-        android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_margin="1dp"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/iv_emailLoginRegisterBtn_ic"
+            app:srcCompat="@drawable/btn_icon_mail"
+            android:scaleType="center"
+            android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_margin="1dp"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     <TextView
-        android:id="@+id/tv_emailLoginRegisterBtn_text"
-        android:text="@string/kdanlrui_signIn_email"
-        android:textColor="@color/kdanlrui_kdan_blue"
-        android:textSize="@dimen/kdanlrui_login_register_text_size"
-        android:fontFamily="@string/font_roboto_medium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@id/iv_emailLoginRegisterBtn_ic"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/tv_emailLoginRegisterBtn_text"
+            android:text="@string/kdanlrui_signIn_email"
+            android:textColor="@color/kdanlrui_kdan_blue"
+            android:textSize="@dimen/kdanlrui_login_register_text_size"
+            android:fontFamily="@string/font_roboto_medium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@id/iv_emailLoginRegisterBtn_ic"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/btn_facebook_login_register.xml

@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-    android:foreground="?attr/selectableItemBackground"
-    android:background="@drawable/bg_facebook_btn"
-    >
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+        android:foreground="?attr/selectableItemBackground"
+        android:background="@drawable/bg_facebook_btn">
 
     <ImageView
-        android:id="@+id/iv_facebookLoginRegisterBtn_ic"
-        android:src="@drawable/btn_icon_fb"
-        android:scaleType="centerCrop"
-        android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="1dp"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/iv_facebookLoginRegisterBtn_ic"
+            app:srcCompat="@drawable/btn_icon_fb"
+            android:scaleType="centerCrop"
+            android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="1dp"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     <TextView
-        android:id="@+id/tv_facebookLoginRegisterBtn_text"
-        android:text="@string/kdanlrui_signIn_facebook"
-        android:textColor="@color/kdanlrui_third_party_btn_text"
-        android:textSize="@dimen/kdanlrui_login_register_text_size"
-        android:fontFamily="@string/font_roboto_medium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@id/iv_facebookLoginRegisterBtn_ic"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/tv_facebookLoginRegisterBtn_text"
+            android:text="@string/kdanlrui_signIn_facebook"
+            android:textColor="@color/kdanlrui_third_party_btn_text"
+            android:textSize="@dimen/kdanlrui_login_register_text_size"
+            android:fontFamily="@string/font_roboto_medium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@id/iv_facebookLoginRegisterBtn_ic"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/btn_google_login_register.xml

@@ -1,39 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
-    android:foreground="?attr/selectableItemBackground"
-    android:background="@drawable/bg_google_btn"
-    >
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+        android:foreground="?attr/selectableItemBackground"
+        android:background="@drawable/bg_google_btn">
 
     <ImageView
-        android:id="@+id/iv_googleLoginRegisterBtn_ic"
-        android:src="@drawable/btn_icon_google"
-        android:scaleType="centerCrop"
-        android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="1dp"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/iv_googleLoginRegisterBtn_ic"
+            app:srcCompat="@drawable/btn_icon_google"
+            android:scaleType="centerCrop"
+            android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_margin="1dp"
+            app:layout_constraintDimensionRatio="1:1"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     <TextView
-        android:id="@+id/tv_googleLoginRegisterBtn_text"
-        android:text="@string/kdanlrui_signIn_google"
-        android:textColor="@color/kdanlrui_third_party_btn_text"
-        android:textSize="@dimen/kdanlrui_login_register_text_size"
-        android:fontFamily="@string/font_roboto_medium"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toRightOf="@id/iv_googleLoginRegisterBtn_ic"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/tv_googleLoginRegisterBtn_text"
+            android:text="@string/kdanlrui_signIn_google"
+            android:textColor="@color/kdanlrui_third_party_btn_text"
+            android:textSize="@dimen/kdanlrui_login_register_text_size"
+            android:fontFamily="@string/font_roboto_medium"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toRightOf="@id/iv_googleLoginRegisterBtn_ic"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/dialog_email_login.xml

@@ -1,48 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/kdanlrui_email_login_register_form_bg"
-    >
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/kdanlrui_email_login_register_form_bg">
 
     <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideLine_emailLoginForm_centerVertical"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintGuide_percent="0.5"
-        />
+            android:id="@+id/guideLine_emailLoginForm_centerVertical"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintGuide_percent="0.5"/>
 
     <Space
-        android:id="@+id/anchor_emailLoginForm_left"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="136dp"
-        android:layout_marginEnd="136dp"
-        app:layout_constraintRight_toRightOf="@id/guideLine_emailLoginForm_centerVertical"
-        />
+            android:id="@+id/anchor_emailLoginForm_left"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="136dp"
+            android:layout_marginEnd="136dp"
+            app:layout_constraintRight_toRightOf="@id/guideLine_emailLoginForm_centerVertical"/>
 
     <Space
-        android:id="@+id/anchor_emailLoginForm_right"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="136dp"
-        android:layout_marginStart="136dp"
-        app:layout_constraintLeft_toLeftOf="@id/guideLine_emailLoginForm_centerVertical"
-        />
+            android:id="@+id/anchor_emailLoginForm_right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="136dp"
+            android:layout_marginStart="136dp"
+            app:layout_constraintLeft_toLeftOf="@id/guideLine_emailLoginForm_centerVertical"/>
 
     <com.kdanmobile.kdanloginregisterui.widget.EmailLoginFormView
-        android:id="@+id/formView_emailLoginDialog"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="@id/anchor_emailLoginForm_left"
-        app:layout_constraintRight_toRightOf="@id/anchor_emailLoginForm_right"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="54dp"
-        android:layout_marginBottom="54dp"
-        />
+            android:id="@+id/formView_emailLoginDialog"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="@id/anchor_emailLoginForm_left"
+            app:layout_constraintRight_toRightOf="@id/anchor_emailLoginForm_right"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="54dp"
+            android:layout_marginBottom="54dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/dialog_email_register.xml

@@ -1,48 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/kdanlrui_email_login_register_form_bg"
-    >
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/kdanlrui_email_login_register_form_bg">
 
     <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideLine_emailRegisterForm_centerVertical"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintGuide_percent="0.5"
-        />
+            android:id="@+id/guideLine_emailRegisterForm_centerVertical"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintGuide_percent="0.5"/>
 
     <Space
-        android:id="@+id/anchor_emailRegisterForm_left"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="136dp"
-        android:layout_marginEnd="136dp"
-        app:layout_constraintRight_toRightOf="@id/guideLine_emailRegisterForm_centerVertical"
-        />
+            android:id="@+id/anchor_emailRegisterForm_left"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="136dp"
+            android:layout_marginEnd="136dp"
+            app:layout_constraintRight_toRightOf="@id/guideLine_emailRegisterForm_centerVertical"/>
 
     <Space
-        android:id="@+id/anchor_emailRegisterForm_right"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="136dp"
-        android:layout_marginStart="136dp"
-        app:layout_constraintLeft_toLeftOf="@id/guideLine_emailRegisterForm_centerVertical"
-        />
+            android:id="@+id/anchor_emailRegisterForm_right"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="136dp"
+            android:layout_marginStart="136dp"
+            app:layout_constraintLeft_toLeftOf="@id/guideLine_emailRegisterForm_centerVertical"/>
 
     <com.kdanmobile.kdanloginregisterui.widget.EmailRegisterFormView
-        android:id="@+id/formView_emailRegisterDialog"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="@id/anchor_emailRegisterForm_left"
-        app:layout_constraintRight_toRightOf="@id/anchor_emailRegisterForm_right"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:layout_marginTop="54dp"
-        android:layout_marginBottom="54dp"
-        />
+            android:id="@+id/formView_emailRegisterDialog"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="@id/anchor_emailRegisterForm_left"
+            app:layout_constraintRight_toRightOf="@id/anchor_emailRegisterForm_right"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_marginTop="54dp"
+            android:layout_marginBottom="54dp"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/edit_text_pwd.xml

@@ -1,33 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height">
 
     <EditText
-        android:id="@+id/et_pwdEditText_pwd"
-        style="@style/EmailLoginRegisterFormEditText"
-        android:inputType="textPassword"
-        android:hint="@string/kdanlrui_email_login_register_dialog_password_edit_text_hint"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/et_pwdEditText_pwd"
+            style="@style/EmailLoginRegisterFormEditText"
+            android:inputType="textPassword"
+            android:hint="@string/kdanlrui_email_login_register_dialog_password_edit_text_hint"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 
     <TextView
-        android:id="@+id/tv_pwdEditText_minimumHint"
-        android:text="@string/kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum"
-        android:textSize="10sp"
-        android:textColor="#aeaeae"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginRight="10dp"
-        android:layout_marginEnd="10dp"
-        app:layout_constraintRight_toRightOf="@id/et_pwdEditText_pwd"
-        app:layout_constraintTop_toTopOf="@id/et_pwdEditText_pwd"
-        app:layout_constraintBottom_toBottomOf="@id/et_pwdEditText_pwd"
-        />
+            android:id="@+id/tv_pwdEditText_minimumHint"
+            android:text="@string/kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum"
+            android:textSize="10sp"
+            android:textColor="#aeaeae"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginRight="10dp"
+            android:layout_marginEnd="10dp"
+            app:layout_constraintRight_toRightOf="@id/et_pwdEditText_pwd"
+            app:layout_constraintTop_toTopOf="@id/et_pwdEditText_pwd"
+            app:layout_constraintBottom_toBottomOf="@id/et_pwdEditText_pwd"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/view_email_login_form.xml

@@ -1,76 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <EditText
-        android:id="@+id/et_emailLoginForm_email"
-        style="@style/EmailLoginRegisterFormEditText"
-        android:inputType="textEmailAddress"
-        android:hint="@string/kdanlrui_email_login_register_dialog_email_edit_text_hint"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@id/et_emailLoginForm_pwd"
-        app:layout_constraintVertical_chainStyle="packed"
-        />
+            android:id="@+id/et_emailLoginForm_email"
+            style="@style/EmailLoginRegisterFormEditText"
+            android:inputType="textEmailAddress"
+            android:hint="@string/kdanlrui_email_login_register_dialog_email_edit_text_hint"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@id/et_emailLoginForm_pwd"
+            app:layout_constraintVertical_chainStyle="packed"/>
 
     <com.kdanmobile.kdanloginregisterui.widget.PwdEditText
-        android:id="@+id/et_emailLoginForm_pwd"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
-        android:layout_marginTop="10dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_email"
-        app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"
-        />
+            android:id="@+id/et_emailLoginForm_pwd"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
+            android:layout_marginTop="10dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_email"
+            app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"/>
 
     <Space
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
-        app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"
-        />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
+            app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"/>
 
     <androidx.appcompat.widget.AppCompatCheckBox
-        android:id="@+id/cb_emailLogin_rememberMe"
-        android:text="@string/kdanlrui_email_login_remember_me_check_box"
-        android:textSize="12sp"
-        android:buttonTint="@color/kdanlrui_email_login_register_form_primary_blue"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
-        app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"
-        />
+            android:id="@+id/cb_emailLogin_rememberMe"
+            android:text="@string/kdanlrui_email_login_remember_me_check_box"
+            android:textSize="12sp"
+            android:buttonTint="@color/kdanlrui_email_login_register_form_primary_blue"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
+            app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"/>
 
     <TextView
-        android:id="@+id/tv_emailLogin_pwdHelp"
-        android:text="@string/kdanlrui_email_login_pwd_help"
-        android:textColor="@color/kdanlrui_email_login_pwd_helper"
-        android:textSize="12sp"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
-        app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"
-        />
+            android:id="@+id/tv_emailLogin_pwdHelp"
+            android:text="@string/kdanlrui_email_login_pwd_help"
+            android:textColor="@color/kdanlrui_email_login_pwd_helper"
+            android:textSize="12sp"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
+            app:layout_constraintBottom_toTopOf="@+id/btn_emailLoginForm_login"/>
 
     <Button
-        android:id="@+id/btn_emailLoginForm_login"
-        style="@style/EmailLoginRegisterFormSubmitBtn"
-        android:text="@string/kdanlrui_email_register_dialog_submit_btn"
-        android:layout_width="0dp"
-        android:layout_height="36dp"
-        android:layout_marginTop="46dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/btn_emailLoginForm_login"
+            style="@style/EmailLoginRegisterFormSubmitBtn"
+            android:text="@string/kdanlrui_email_register_dialog_submit_btn"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+            android:layout_marginTop="46dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_emailLoginForm_pwd"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>

src/main/res/layout/view_email_register_form.xml

@@ -1,59 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    >
+<androidx.constraintlayout.widget.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
     <EditText
-        android:id="@+id/et_emailRegisterForm_name"
-        style="@style/EmailLoginRegisterFormEditText"
-        android:inputType="text"
-        android:hint="@string/kdanlrui_email_login_register_dialog_name_edit_text_hint"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/et_emailRegisterForm_email"
-        app:layout_constraintVertical_chainStyle="packed"
-        />
+            android:id="@+id/et_emailRegisterForm_name"
+            style="@style/EmailLoginRegisterFormEditText"
+            android:inputType="text"
+            android:hint="@string/kdanlrui_email_login_register_dialog_name_edit_text_hint"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/et_emailRegisterForm_email"
+            app:layout_constraintVertical_chainStyle="packed"/>
 
     <EditText
-        android:id="@+id/et_emailRegisterForm_email"
-        style="@style/EmailLoginRegisterFormEditText"
-        android:inputType="textEmailAddress"
-        android:hint="@string/kdanlrui_email_login_register_dialog_email_edit_text_hint"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
-        android:layout_marginTop="10dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_emailRegisterForm_name"
-        app:layout_constraintBottom_toTopOf="@id/et_emailRegisterForm_pwd"
-        />
+            android:id="@+id/et_emailRegisterForm_email"
+            style="@style/EmailLoginRegisterFormEditText"
+            android:inputType="textEmailAddress"
+            android:hint="@string/kdanlrui_email_login_register_dialog_email_edit_text_hint"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
+            android:layout_marginTop="10dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_emailRegisterForm_name"
+            app:layout_constraintBottom_toTopOf="@id/et_emailRegisterForm_pwd"/>
 
     <com.kdanmobile.kdanloginregisterui.widget.PwdEditText
-        android:id="@+id/et_emailRegisterForm_pwd"
-        android:layout_width="0dp"
-        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
-        android:layout_marginTop="10dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_emailRegisterForm_email"
-        app:layout_constraintBottom_toTopOf="@+id/btn_emailRegisterForm_submit"
-        />
+            android:id="@+id/et_emailRegisterForm_pwd"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
+            android:layout_marginTop="10dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_emailRegisterForm_email"
+            app:layout_constraintBottom_toTopOf="@+id/btn_emailRegisterForm_submit"/>
 
     <Button
-        android:id="@+id/btn_emailRegisterForm_submit"
-        style="@style/EmailLoginRegisterFormSubmitBtn"
-        android:text="@string/kdanlrui_email_register_dialog_submit_btn"
-        android:layout_width="0dp"
-        android:layout_height="36dp"
-        android:layout_marginTop="20dp"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintRight_toRightOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/et_emailRegisterForm_pwd"
-        app:layout_constraintBottom_toBottomOf="parent"
-        />
+            android:id="@+id/btn_emailRegisterForm_submit"
+            style="@style/EmailLoginRegisterFormSubmitBtn"
+            android:text="@string/kdanlrui_email_register_dialog_submit_btn"
+            android:layout_width="0dp"
+            android:layout_height="@dimen/kdanlrui_login_register_btn_height"
+            android:layout_marginTop="20dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintRight_toRightOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/et_emailRegisterForm_pwd"
+            app:layout_constraintBottom_toBottomOf="parent"/>
 </androidx.constraintlayout.widget.ConstraintLayout>