Remove activities

src/main/AndroidManifest.xml

@@ -3,30 +3,6 @@
     package="com.kdanmobile.kdanloginregisterui">
 
     <application>
-        <activity
-            android:name=".screen.LoginBActivity"
-            android:exported="${isDebug}"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name=".screen.RegisterBActivity"
-            android:exported="${isDebug}"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name=".screen.LoginAActivity"
-            android:exported="${isDebug}"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
-        <activity
-            android:name=".screen.RegisterAActivity"
-            android:exported="${isDebug}"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
-        <activity android:name=".screen.BindAccountActivity"
-            android:exported="${isDebug}"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
-            android:windowSoftInputMode="stateHidden" />
     </application>
 
 </manifest>

src/main/java/com/kdanmobile/kdanloginregisterui/screen/BaseLoginActivity.kt

@@ -1,48 +0,0 @@
-package com.kdanmobile.kdanloginregisterui.screen
-
-import com.kdanmobile.kdanloginregisterui.Utils.toSpannable
-
-import android.support.v7.app.AppCompatActivity
-import android.text.method.LinkMovementMethod
-import android.view.View
-import android.widget.TextView
-import com.kdanmobile.kdanloginregisterui.R
-
-open class BaseLoginActivity : AppCompatActivity() {
-    protected var email: String = ""
-    protected var pwd: String = ""
-    protected var isRemember: Boolean = false
-
-    protected open fun onEmailLogin(email: String, pwd: String, isRemember: Boolean) { }
-    protected open fun onClickFbLoginBtn(view: View?) { }
-    protected open fun onClickGoogleLoginBtn(view: View?) {}
-    protected open fun onClickTurnOfService(view: View?) { }
-    protected open fun onClickPrivacyPolicy(view: View?) { }
-    protected open fun onClickSwitchToRegister(view: View?) { }
-    protected open fun onClickPwdHelp(view: View?) {}
-    protected open fun onClickCloseBtn(view: View?) { }
-
-    protected fun setupTosAndPpTextView(textView: TextView) {
-        val tos = getString(R.string.terms_of_service)
-        val pp = getString(R.string.privacy_policy)
-        val textColor = resources.getColor(R.color.tos_pp_text)
-        val tosSS = tos.toSpannable(textColor, false, View.OnClickListener { v -> onClickTurnOfService(v) })
-        val ppSS = pp.toSpannable(textColor, false, View.OnClickListener { v -> onClickPrivacyPolicy(v) })
-        textView.apply {
-            movementMethod = LinkMovementMethod.getInstance()
-            append(tosSS)
-            append(" & ")
-            append(ppSS)
-        }
-    }
-
-    protected fun setupSwitchTextView(textView: TextView) {
-        val s = textView.text
-        val textColor = resources.getColor(R.color.switch_text)
-        val ss = s.toSpannable(textColor, true, View.OnClickListener { v -> onClickSwitchToRegister(v) })
-        textView.apply {
-            movementMethod = LinkMovementMethod.getInstance()
-            text = ss
-        }
-    }
-}

src/main/java/com/kdanmobile/kdanloginregisterui/screen/BaseRegisterActivity.kt

@@ -1,54 +0,0 @@
-package com.kdanmobile.kdanloginregisterui.screen
-
-import com.kdanmobile.kdanloginregisterui.Utils.toSpannable
-
-import android.support.v7.app.AppCompatActivity
-import android.text.method.LinkMovementMethod
-import android.view.View
-import android.widget.TextView
-import com.kdanmobile.kdanloginregisterui.R
-
-open class BaseRegisterActivity : AppCompatActivity() {
-
-    protected open fun onEmailRegister(name: String, email: String, pwd: String) { }
-    protected open fun onClickFbRegisterBtn(view: View?) { }
-    protected open fun onClickGoogleRegisterBtn(view: View?) {}
-    protected open fun onClickTurnOfService(view: View?) { }
-    protected open fun onClickPrivacyPolicy(view: View?) { }
-    protected open fun onClickSwitchToLogin(view: View?) { }
-    protected open fun onClickCloseBtn(view: View?) { }
-
-    protected fun setupSwitchTextView(textView: TextView) {
-        val s = textView.text
-        val textColor = resources.getColor(R.color.switch_text)
-        val ss = s.toSpannable(textColor, true, View.OnClickListener { v -> onClickSwitchToLogin(v) })
-        textView.apply {
-            movementMethod = LinkMovementMethod.getInstance()
-            text = ss
-        }
-    }
-
-    protected fun setupTosAndPpTextView(textView: TextView) {
-        try {
-            val key = "[d*_*b]"
-            val tos = getString(R.string.terms_of_service)
-            val pp = getString(R.string.privacy_policy)
-            val pattern = getString(R.string.register_tos_and_pp_pattern, key, key)
-            val stringArray = pattern.split(key)
-            val textColor = resources.getColor(R.color.tos_pp_text)
-            val tosSS = tos.toSpannable(textColor, false, View.OnClickListener { v -> onClickTurnOfService(v) })
-            val ppSS = pp.toSpannable(textColor, false, View.OnClickListener { v -> onClickPrivacyPolicy(v) })
-            textView.apply {
-                movementMethod = LinkMovementMethod.getInstance()
-                append(stringArray[0])
-                append(tosSS)
-                append(stringArray[1])
-                append(ppSS)
-                append(stringArray[2])
-            }
-        } catch (e: Exception) {
-            // do nothing, let it go ~
-        }
-    }
-
-}

src/main/java/com/kdanmobile/kdanloginregisterui/screen/BindAccountActivity.kt

@@ -1,67 +0,0 @@
-package com.kdanmobile.kdanloginregisterui.screen
-
-import android.support.v7.app.AppCompatActivity
-import android.os.Bundle
-import android.text.TextUtils
-import android.view.View
-import android.widget.Toast
-import com.kdanmobile.kdanloginregisterui.R
-import kotlinx.android.synthetic.main.activity_bind_account.*
-import org.apache.commons.validator.routines.EmailValidator
-
-open class BindAccountActivity : AppCompatActivity() {
-
-    protected var email: String
-        get() = et_bindAccount_existingEmail.text.toString()
-        set(value) {}
-    protected var pwd: String
-        get() = et_bindAccount_existingPwd.text.toString()
-        set(value) {}
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_bind_account)
-        setThirdPtyName("Google")
-        btn_bindAccount_back.setOnClickListener { onClickBackBtn(it) }
-        btn_bindAccount_create.setOnClickListener { onClickCreateBtn(it) }
-        btn_bindAccount_bind.setOnClickListener { onClickConnectBtn() }
-    }
-
-    protected open fun onConnect(email: String, pwd: String) {
-        val msg = """
-            email: $email
-            pwd: $pwd
-        """.trimIndent()
-        Toast.makeText(this, msg, Toast.LENGTH_LONG).show()
-    }
-
-    protected open fun onClickCreateBtn(view: View) {
-        Toast.makeText(this, "on click create", Toast.LENGTH_LONG).show()
-    }
-
-    protected open fun onClickBackBtn(view: View) {
-        Toast.makeText(this, "on back", Toast.LENGTH_LONG).show()
-    }
-
-    protected fun setThirdPtyName(name: String) {
-        tv_bindAccount_createNew.text = getString(R.string.bind_account_create_new_text, name)
-        tv_bindAccount_bind.text = getString(R.string.bind_account_bind_text, name)
-        tv_bindAccount_bindExplanation.text = getString(R.string.bind_account_bind_explanation, name)
-    }
-
-    private fun onClickConnectBtn() {
-        val isEmailValid = !TextUtils.isEmpty(email) && EmailValidator.getInstance().isValid(email)
-        val isPwdValid = !TextUtils.isEmpty(pwd)
-        et_bindAccount_existingEmail.error = when {
-            isEmailValid -> null
-            else -> getString(R.string.email_login_register_dialog_email_error)
-        }
-        et_bindAccount_existingPwd.error = when {
-            isPwdValid -> null
-            else -> getString(R.string.email_login_register_dialog_pwd_error)
-        }
-        if (isEmailValid && isPwdValid) {
-            onConnect(email, pwd)
-        }
-    }
-}

src/main/java/com/kdanmobile/kdanloginregisterui/screen/LoginAActivity.kt

@@ -1,70 +0,0 @@
-package com.kdanmobile.kdanloginregisterui.screen
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import com.kdanmobile.kdanloginregisterui.R
-import kotlinx.android.synthetic.main.activity_login_a.*
-
-open class LoginAActivity : BaseLoginActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login_a)
-        setupTosAndPpTextView(tv_loginA_tosAndPp)
-        setupSwitchTextView(tv_loginA_switchToRegister)
-        setupFormView()
-        view_loginA_fbLogin.setOnClickListener { onClickFbLoginBtn(it) }
-        view_loginA_googleLogin.setOnClickListener { onClickGoogleLoginBtn(it) }
-        btn_loginA_close.setOnClickListener { onClickCloseBtn(it) }
-    }
-
-    private fun setupFormView() {
-        emailLoginFromView_loginA.let {
-            it.isRemember = isRemember
-            it.email = email
-            it.pwd = pwd
-            it.onClickPwdHelp = View.OnClickListener { onClickPwdHelp(it) }
-            it.onSubmit = Runnable { onEmailLogin(it.email, it.pwd, it.isRemember) }
-        }
-    }
-
-    override fun onEmailLogin(email: String, pwd: String, isRemember: Boolean) {
-        val msg = """
-            email: $email
-            wpd: $pwd
-            isRemember: $isRemember
-        """.trimIndent()
-        Toast.makeText(this, msg, Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickFbLoginBtn(view: View?) {
-        Toast.makeText(this, "on fb login", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickGoogleLoginBtn(view: View?) {
-        Toast.makeText(this, "on google login", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickTurnOfService(view: View?) {
-        Toast.makeText(this, "on click tos", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickPrivacyPolicy(view: View?) {
-        Toast.makeText(this, "on click pp", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickSwitchToRegister(view: View?) {
-        val intent = Intent(this, RegisterAActivity::class.java)
-        startActivity(intent)
-    }
-
-    override fun onClickPwdHelp(view: View?) {
-        Toast.makeText(this, "on click pwd help", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickCloseBtn(view: View?) {
-        finish()
-    }
-}

src/main/java/com/kdanmobile/kdanloginregisterui/screen/LoginBActivity.kt

@@ -1,83 +0,0 @@
-package com.kdanmobile.kdanloginregisterui.screen
-
-import android.content.Intent
-import android.os.Bundle
-import android.support.v7.app.AlertDialog
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.Toast
-import com.kdanmobile.kdanloginregisterui.R
-import com.kdanmobile.kdanloginregisterui.widget.EmailLoginFormView
-import kotlinx.android.synthetic.main.activity_login_b.*
-
-open class LoginBActivity : BaseLoginActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_login_b)
-        setupTosAndPpTextView(tv_loginB_tosAndPp)
-        setupSwitchTextView(tv_loginB_switchToRegister)
-        setupEmailLoginBtn()
-        view_loginB_fbLogin.setOnClickListener { onClickFbLoginBtn(it) }
-        view_loginB_googleLogin.setOnClickListener { onClickGoogleLoginBtn(it) }
-        btn_loginB_close.setOnClickListener { onClickCloseBtn(it) }
-    }
-
-    override fun onEmailLogin(email: String, pwd: String, isRemember: Boolean) {
-        val msg = """
-            email: $email
-            pwd: $pwd
-            isRemember: $isRemember
-        """.trimIndent()
-        Toast.makeText(this, msg, Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickFbLoginBtn(view: View?) {
-        Toast.makeText(this, "on fb login", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickGoogleLoginBtn(view: View?) {
-        Toast.makeText(this, "on google login", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickTurnOfService(view: View?) {
-        Toast.makeText(this, "on click tos", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickPrivacyPolicy(view: View?) {
-        Toast.makeText(this, "on click pp", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickPwdHelp(view: View?) {
-        Toast.makeText(this, "on click pwd help", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickCloseBtn(view: View?) {
-        finish()
-    }
-
-    override fun onClickSwitchToRegister(view: View?) {
-        val intent = Intent(this, RegisterBActivity::class.java)
-        startActivity(intent)
-        finish()
-    }
-
-    private fun setupEmailLoginBtn() {
-        view_loginB_emailLogin.setOnClickListener {
-            val context = this
-            val view = LayoutInflater.from(context).inflate(R.layout.dialog_email_login, null)
-            val formView = view.findViewById<EmailLoginFormView>(R.id.formView_emailLoginDialog)
-            val dialog = AlertDialog.Builder(context).setView(view).show()
-            formView.let {
-                it.isRemember = isRemember
-                it.email = email
-                it.pwd = pwd
-                it.onSubmit = Runnable {
-                    onEmailLogin(it.email, it.pwd, it.isRemember)
-                    dialog.dismiss()
-                }
-                it.onClickPwdHelp = View.OnClickListener { onClickPwdHelp(it) }
-            }
-        }
-    }
-}

src/main/java/com/kdanmobile/kdanloginregisterui/screen/RegisterAActivity.kt

@@ -1,57 +0,0 @@
-package com.kdanmobile.kdanloginregisterui.screen
-
-import android.content.Intent
-import android.os.Bundle
-import android.view.View
-import android.widget.Toast
-import com.kdanmobile.kdanloginregisterui.R
-import kotlinx.android.synthetic.main.activity_register_a.*
-
-open class RegisterAActivity : BaseRegisterActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_register_a)
-        setupSwitchTextView(tv_registerA_switchToLogin)
-        setupTosAndPpTextView(tv_registerA_tosAndPp)
-        emailRegisterFromView_registerA.apply {
-            onSubmit = Runnable { onEmailRegister(name, email, pwd) }
-        }
-        view_registerA_fbRegister.setOnClickListener { onClickFbRegisterBtn(it) }
-        view_registerA_googleRegister.setOnClickListener { onClickGoogleRegisterBtn(it) }
-    }
-
-    override fun onEmailRegister(name: String, email: String, pwd: String) {
-        val msg = """
-            name: $name
-            email: $email
-            pwd: $pwd
-        """.trimIndent()
-        Toast.makeText(this, msg, Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickFbRegisterBtn(view: View?) {
-        Toast.makeText(this, "on fb register", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickGoogleRegisterBtn(view: View?) {
-        Toast.makeText(this, "on google register", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickTurnOfService(view: View?) {
-        Toast.makeText(this, "on click tos", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickPrivacyPolicy(view: View?) {
-        Toast.makeText(this, "on click pp", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickSwitchToLogin(view: View?) {
-        val intent = Intent(this, LoginAActivity::class.java)
-        startActivity(intent)
-    }
-
-    override fun onClickCloseBtn(view: View?) {
-        finish()
-    }
-}

src/main/java/com/kdanmobile/kdanloginregisterui/screen/RegisterBActivity.kt

@@ -1,75 +0,0 @@
-package com.kdanmobile.kdanloginregisterui.screen
-
-import android.content.Intent
-import android.os.Bundle
-import android.support.v7.app.AlertDialog
-import android.view.LayoutInflater
-import android.view.View
-import android.widget.Toast
-import com.kdanmobile.kdanloginregisterui.R
-import com.kdanmobile.kdanloginregisterui.widget.EmailRegisterFormView
-import kotlinx.android.synthetic.main.activity_register_b.*
-
-open class RegisterBActivity : BaseRegisterActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_register_b)
-        setupSwitchTextView(tv_registerB_switchToLogin)
-        setupTosAndPpTextView(tv_registerB_tosAndPp)
-        setupEmailRegisterBtn()
-        view_registerB_fbRegister.setOnClickListener { onClickFbRegisterBtn(it) }
-        view_registerB_googleRegister.setOnClickListener { onClickGoogleRegisterBtn(it) }
-        btn_registerB_close.setOnClickListener { onClickCloseBtn(it) }
-    }
-
-    override fun onEmailRegister(name: String, email: String, pwd: String) {
-        val msg = """
-            name: $name
-            email: $email
-            pwd: $pwd
-        """.trimIndent()
-        Toast.makeText(this, msg, Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickFbRegisterBtn(view: View?) {
-        Toast.makeText(this, "on fb register", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickGoogleRegisterBtn(view: View?) {
-        Toast.makeText(this, "on google register", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickTurnOfService(view: View?) {
-        Toast.makeText(this, "on click tos", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickPrivacyPolicy(view: View?) {
-        Toast.makeText(this, "on click pp", Toast.LENGTH_LONG).show()
-    }
-
-    override fun onClickCloseBtn(view: View?) {
-        finish()
-    }
-
-    override fun onClickSwitchToLogin(view: View?) {
-        val intent = Intent(this, LoginBActivity::class.java)
-        startActivity(intent)
-        finish()
-    }
-
-    private fun setupEmailRegisterBtn() {
-        view_registerB_emailRegister.setOnClickListener {
-            val context = this
-            val view = LayoutInflater.from(context).inflate(R.layout.dialog_email_register, null)
-            val formView = view.findViewById<EmailRegisterFormView>(R.id.formView_emailRegisterDialog)
-            val dialog = AlertDialog.Builder(context).setView(view).show()
-            formView.let {
-                it.onSubmit = Runnable {
-                    onEmailRegister(it.name, it.email, it.pwd)
-                    dialog.dismiss()
-                }
-            }
-        }
-    }
-}