Change bind account view function

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

@@ -13,12 +13,14 @@ class BindAccountView @JvmOverloads constructor(
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) : ConstraintLayout(context, attrs, defStyleAttr) {
 
-    var email: String
-        get() = et_bindAccount_email.text.toString()
+    var existingEmail: String
+        get() = et_bindAccount_existingEmail.text.toString()
         set(value) {}
-    var pwd: String
-        get() = et_bindAccount_pwd.text.toString()
+    var existingPwd: String
+        get() = et_bindAccount_existingPwd.text.toString()
         set(value) {}
+    val newEmail: String
+        get() = et_bindAccount_newEmail.text.toString()
 
     lateinit var onClickConnect: Runnable
     lateinit var onClickCreate: Runnable
@@ -27,24 +29,34 @@ class BindAccountView @JvmOverloads constructor(
         View.inflate(context, R.layout.activity_bind_account, this)
         setThirdPtyName("Google")
         btn_bindAccount_back.setOnClickListener { onClickBack.run() }
-        btn_bindAccount_create.setOnClickListener { onClickCreate.run() }
+        btn_bindAccount_create.setOnClickListener { onClickCreateBtn() }
         btn_bindAccount_bind.setOnClickListener { onClickConnectBtn() }
     }
 
     protected fun setThirdPtyName(name: String) {
-        tv_bindAccount_createNew.text = context.getString(R.string.bind_account_create_new_text, name)
         tv_bindAccount_bind.text = context.getString(R.string.bind_account_bind_text, name)
         tv_bindAccount_bindExplanation.text = context.getString(R.string.bind_account_bind_explanation, name)
     }
 
+    private fun onClickCreateBtn() {
+        val isEmailValid = !TextUtils.isEmpty(newEmail) && EmailValidator.getInstance().isValid(newEmail)
+        et_bindAccount_newEmail.error = when(isEmailValid) {
+            true -> null
+            false -> context.getString(R.string.email_login_register_dialog_email_error)
+        }
+        if (isEmailValid) {
+            onClickCreate.run()
+        }
+    }
+
     private fun onClickConnectBtn() {
-        val isEmailValid = !TextUtils.isEmpty(email) && EmailValidator.getInstance().isValid(email)
-        val isPwdValid = !TextUtils.isEmpty(pwd)
-        et_bindAccount_email.error = when {
+        val isEmailValid = !TextUtils.isEmpty(existingEmail) && EmailValidator.getInstance().isValid(existingEmail)
+        val isPwdValid = !TextUtils.isEmpty(existingPwd)
+        et_bindAccount_existingEmail.error = when {
             isEmailValid -> null
             else -> context.getString(R.string.email_login_register_dialog_email_error)
         }
-        et_bindAccount_pwd.error = when {
+        et_bindAccount_existingPwd.error = when {
             isPwdValid -> null
             else -> context.getString(R.string.email_login_register_dialog_pwd_error)
         }

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

@@ -12,10 +12,10 @@ import org.apache.commons.validator.routines.EmailValidator
 open class BindAccountActivity : AppCompatActivity() {
 
     protected var email: String
-        get() = et_bindAccount_email.text.toString()
+        get() = et_bindAccount_existingEmail.text.toString()
         set(value) {}
     protected var pwd: String
-        get() = et_bindAccount_pwd.text.toString()
+        get() = et_bindAccount_existingPwd.text.toString()
         set(value) {}
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -52,11 +52,11 @@ open class BindAccountActivity : AppCompatActivity() {
     private fun onClickConnectBtn() {
         val isEmailValid = !TextUtils.isEmpty(email) && EmailValidator.getInstance().isValid(email)
         val isPwdValid = !TextUtils.isEmpty(pwd)
-        et_bindAccount_email.error = when {
+        et_bindAccount_existingEmail.error = when {
             isEmailValid -> null
             else -> getString(R.string.email_login_register_dialog_email_error)
         }
-        et_bindAccount_pwd.error = when {
+        et_bindAccount_existingPwd.error = when {
             isPwdValid -> null
             else -> getString(R.string.email_login_register_dialog_pwd_error)
         }

src/main/res/layout/activity_bind_account.xml

@@ -61,21 +61,33 @@
                 />
 
             <TextView
-                android:visibility="gone"
                 android:id="@+id/tv_bindAccount_createNew"
                 android:layout_width="0dp"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
                 android:gravity="center_vertical|left"
                 android:text="@string/bind_account_create_new_text"
-                app:layout_constraintBottom_toTopOf="@id/btn_bindAccount_create"
+                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/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:visibility="gone"
                 android:id="@+id/btn_bindAccount_create"
                 android:text="@string/bind_account_create_new_btn"
                 android:textSize="14sp"
@@ -83,15 +95,14 @@
                 android:background="@drawable/bg_bind_account_create_btn"
                 android:layout_width="0dp"
                 android:layout_height="40dp"
-                android:layout_marginTop="12dp"
+                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/tv_bindAccount_createNew"
+                app:layout_constraintTop_toBottomOf="@id/et_bindAccount_newEmail"
                 app:layout_constraintBottom_toTopOf="@id/tv_bindAccount_orDivider"
                 />
 
             <TextView
-                android:visibility="gone"
                 android:id="@+id/tv_bindAccount_orDivider"
                 android:text="@string/or"
                 android:textSize="@dimen/or_divider_text_size"
@@ -106,7 +117,6 @@
                 />
 
             <View
-                android:visibility="gone"
                 android:background="@color/or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
@@ -119,7 +129,6 @@
                 />
 
             <View
-                android:visibility="gone"
                 android:background="@color/or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
@@ -132,7 +141,6 @@
                 />
 
             <TextView
-                android:visibility="gone"
                 android:id="@+id/tv_bindAccount_bind"
                 android:text="@string/bind_account_bind_text"
                 android:gravity="center_vertical|left"
@@ -142,11 +150,11 @@
                 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_email"
+                app:layout_constraintBottom_toTopOf="@id/et_bindAccount_existingEmail"
                 />
 
             <EditText
-                android:id="@+id/et_bindAccount_email"
+                android:id="@+id/et_bindAccount_existingEmail"
                 style="@style/EmailLoginRegisterFormEditText"
                 android:inputType="textEmailAddress"
                 android:hint="@string/email_input_hint"
@@ -156,11 +164,11 @@
                 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_pwd"
+                app:layout_constraintBottom_toTopOf="@+id/et_bindAccount_existingPwd"
                 />
 
             <EditText
-                android:id="@+id/et_bindAccount_pwd"
+                android:id="@+id/et_bindAccount_existingPwd"
                 style="@style/EmailLoginRegisterFormEditText"
                 android:inputType="textPassword"
                 android:hint="@string/pwd_input_hint"
@@ -169,7 +177,7 @@
                 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_email"
+                app:layout_constraintTop_toBottomOf="@id/et_bindAccount_existingEmail"
                 app:layout_constraintBottom_toTopOf="@id/btn_bindAccount_bind"
                 />
 
@@ -184,11 +192,12 @@
                 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_pwd"
+                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/bind_account_bind_explanation"
                 android:gravity="center_vertical|left"

src/main/res/values-de/strings.xml

@@ -22,8 +22,8 @@
 	<string name="email_login_remember_me_check_box">Login speichern</string>
 	<string name="email_login_pwd_help">Passwort Hilfe</string>
 	<string name="email_register_dialog_submit_btn">Absenden</string>
-	<string name="bind_account_create_new_text">Ein neues Kdan-Konto mit %1$s erstellen</string>
-	<string name="bind_account_create_new_btn">Erstellen</string>
+	<string name="bind_account_create_new_text">Bitte geben Sie unten Ihre E-Mail-Adresse ein.</string>
+	<string name="bind_account_create_new_btn">Absenden</string>
 	<string name="bind_account_bind_text">Haben Sie bereits ein Konto? Link zu meinem %1$s Konto.\"</string>
 	<string name="bind_account_bind_btn">Verbinden</string>
 	<string name="bind_account_bind_explanation">Kdan Cloud erhält und zeigt nur den Namen und die E-Mail-Adresse aus Ihrem %1$s-Account. Wir werden keine weiteren privaten Informationen nutzen oder in Ihrem Namen posten.</string>

src/main/res/values-es/strings.xml

@@ -23,8 +23,8 @@
     <string name="email_login_remember_me_check_box">Recuérdame</string>
     <string name="email_login_pwd_help">Ayuda de contraseña</string>
     <string name="email_register_dialog_submit_btn">Enviar</string>
-    <string name="bind_account_create_new_text">Crear una nueva cuenta Kdan con %1$s</string>
-    <string name="bind_account_create_new_btn">Crear</string>
+    <string name="bind_account_create_new_text">Introduzca su dirección de correo electrónico a continuación para continuar.</string>
+    <string name="bind_account_create_new_btn">Enviar</string>
     <string name="bind_account_bind_text">Ya tienes una cuenta? Enlace a mi cuenta de %1$s.</string>
     <string name="bind_account_bind_btn">Conectar</string>
     <string name="bind_account_bind_explanation">Kdan Cloud solo recibirá tu nombre de usuario y tu dirección de correo de tu cuenta de %1$s. No usaremos otros datos privados ni publicaremos en tu nombre.</string>

src/main/res/values-fr/strings.xml

@@ -23,8 +23,8 @@
 	<string name="email_login_remember_me_check_box">Se souvenir de moi</string>
 	<string name="email_login_pwd_help">Aide pour le Mot de passe</string>
 	<string name="email_register_dialog_submit_btn">Soumettre</string>
-	<string name="bind_account_create_new_text">Créer un nouveau compte Kdan avec %1$s</string>
-	<string name="bind_account_create_new_btn">Créer</string>
+	<string name="bind_account_create_new_text">Veuillez entrez votre adresse électronique ci-dessous pour continuer.</string>
+	<string name="bind_account_create_new_btn">Soumettre</string>
 	<string name="bind_account_bind_text">Vous avez déjà un compte? Link vers mon compte %1$s.</string>
 	<string name="bind_account_bind_btn">Se connecter</string>
 	<string name="bind_account_bind_explanation">Kdan Cloud ne recevra que votre nom de profil et l\'adresse email de votre compte %1$s. Nous n’utiliserons pas d\'autres informations privées et nous ne publierons pas de post à votre place.</string>

src/main/res/values-it/strings.xml

@@ -22,8 +22,8 @@
     <string name="email_login_remember_me_check_box">Ricordami</string>
     <string name="email_login_pwd_help">Password Aiuto</string>
     <string name="email_register_dialog_submit_btn">Sottometti</string>
-    <string name="bind_account_create_new_text">Crea un nuovo account Kdan tramite %1$s</string>
-    <string name="bind_account_create_new_btn">Crea</string>
+    <string name="bind_account_create_new_text">Inserisci il tuo indirizzo email qui sotto per continuare.</string>
+    <string name="bind_account_create_new_btn">Sottometti</string>
     <string name="bind_account_bind_text">Hai già un account? Link al mio account di %1$s</string>
     <string name="bind_account_bind_btn">Connetti</string>
     <string name="bind_account_bind_explanation">Kdan Cloud riceverà solo il nome visualizzato e indirizzo email dal tuo %1$s account. Non useremo altra informazione o messaggio privato a vostro nome.</string>

src/main/res/values-ja/strings.xml

@@ -23,8 +23,8 @@
     <string name="email_login_remember_me_check_box">保持する</string>
     <string name="email_login_pwd_help">パスワードヘルプ</string>
     <string name="email_register_dialog_submit_btn">送信</string>
-    <string name="bind_account_create_new_text">%1$sで新しいKdanアカウントを作成する</string>
-    <string name="bind_account_create_new_btn">作成する</string>
+    <string name="bind_account_create_new_text">続行するためにあなたのEメールアドレスを下に入力してください。</string>
+    <string name="bind_account_create_new_btn">送信</string>
     <string name="bind_account_bind_text">既にアカウントをお持ちですか？%1$sアカウントにリンクします。</string>
     <string name="bind_account_bind_btn">接続</string>
     <string name="bind_account_bind_explanation">Kdan Cloudはお客様の%1$sのアカウントより表示名とメールアドレスだけを受け取るため、その他の個人情報を利用したり、ご本人の代わりにメッセージを投稿したりすることがございません。</string>

src/main/res/values-ko/strings.xml

@@ -22,8 +22,8 @@
     <string name="email_login_remember_me_check_box">저를 기억해 주세요</string>
     <string name="email_login_pwd_help">비밀번호 찾기</string>
     <string name="email_register_dialog_submit_btn">제출</string>
-    <string name="bind_account_create_new_text">%1$s에 새로운Kdan계좌를 만드세요</string>
-    <string name="bind_account_create_new_btn">만들기</string>
+    <string name="bind_account_create_new_text">계속하려면 아래에 이메일 주소를 입력하십시오.</string>
+    <string name="bind_account_create_new_btn">제출</string>
     <string name="bind_account_bind_text">이미 계정이 있으신가요? %1$s 계정으로 연결</string>
     <string name="bind_account_bind_btn">연결하기</string>
     <string name="bind_account_bind_explanation">Kdan Cloud 는 %1$s계정에서 표기 이름과 이메일 주소만을 받고 있습니다. 저희는 사용자를 대신해서 다른 개인정보나 게시물을 이용하지 않습니다.</string>

src/main/res/values-pt/strings.xml

@@ -23,8 +23,8 @@
     <string name="email_login_remember_me_check_box">Lembrar de mim</string>
     <string name="email_login_pwd_help">Ajuda com a Senha</string>
     <string name="email_register_dialog_submit_btn">Submeter</string>
-    <string name="bind_account_create_new_text">Crie uma nova conta Kdan com %1$s</string>
-    <string name="bind_account_create_new_btn">Criar</string>
+    <string name="bind_account_create_new_text">Favor digitar seu endereço de e-mail abaixo para continuar.</string>
+    <string name="bind_account_create_new_btn">Submeter</string>
     <string name="bind_account_bind_text">Você já tem uma conta? Link para minha conta do %1$s</string>
     <string name="bind_account_bind_btn">Conectar</string>
     <string name="bind_account_bind_explanation">Kdan Cloud apenas receberá o nome de exibição e endereço de e-mail da sua conta do %1$s. Nós não usaremos outras informações privadas e não faremos publicações em seu nome.</string>

src/main/res/values-ru/strings.xml

@@ -22,8 +22,8 @@
     <string name="email_login_remember_me_check_box">Запомнить меня</string>
     <string name="email_login_pwd_help">Напомнить Пароль</string>
     <string name="email_register_dialog_submit_btn">ОК</string>
-    <string name="bind_account_create_new_text">Создать новый Kdan профиль с %1$s</string>
-    <string name="bind_account_create_new_btn">Создать</string>
+    <string name="bind_account_create_new_text">Пожалуйста, ниже введите свой адрес электронной почты для продолжения.</string>
+    <string name="bind_account_create_new_btn">ОК</string>
     <string name="bind_account_bind_text">Уже есть аккаунт? Ссылка на мой аккаунт %1$s.</string>
     <string name="bind_account_bind_btn">Подсоединиться</string>
     <string name="bind_account_bind_explanation">Kdan Cloud будет иметь доступ только к вашему отображаемому имени и электронной почте из вашего аккаунта %1$s. Мы не будем использовать другие персональные данные или отправлять посты от вашего имени.</string>

src/main/res/values-zh-rTW/strings.xml

@@ -23,8 +23,8 @@
     <string name="email_login_remember_me_check_box">記住我</string>
     <string name="email_login_pwd_help">忘記密碼</string>
     <string name="email_register_dialog_submit_btn">送出</string>
-    <string name="bind_account_create_new_text">用%1$s帳號註冊</string>
-    <string name="bind_account_create_new_btn">建立</string>
+    <string name="bind_account_create_new_text">請於下方輸入您的Email信箱繼續</string>
+    <string name="bind_account_create_new_btn">送出</string>
     <string name="bind_account_bind_text">已是註冊會員? 連結我的%1$s帳號</string>
     <string name="bind_account_bind_btn">連結</string>
     <string name="bind_account_bind_explanation">Kdan Cloud只透過%1$s來取得您的Email和姓名，將不會使用其他私人資訊或張貼文章.</string>

src/main/res/values-zh/strings.xml

@@ -23,8 +23,8 @@
     <string name="email_login_remember_me_check_box">记住密码</string>
     <string name="email_login_pwd_help">忘记密码</string>
     <string name="email_register_dialog_submit_btn">提交</string>
-    <string name="bind_account_create_new_text">用%1$s账号注册</string>
-    <string name="bind_account_create_new_btn">创建</string>
+    <string name="bind_account_create_new_text">请于下方输入您的Email以便进行下一步操作</string>
+    <string name="bind_account_create_new_btn">提交</string>
     <string name="bind_account_bind_text">已经是注册会员？绑定%1$s账号。</string>
     <string name="bind_account_bind_btn">绑定</string>
     <string name="bind_account_bind_explanation">凯钿软件通过%1$s获取您的用户名和邮箱，我们不会以此泄露您的个人信息也不会以用户名义发布任何信息</string>

src/main/res/values/strings.xml

@@ -31,8 +31,8 @@
     <string name="email_login_pwd_help">Password Help</string>
     <string name="email_register_dialog_submit_btn">Submit</string>
 
-    <string name="bind_account_create_new_text">Create a new Kdan account with a %1$s</string>
-    <string name="bind_account_create_new_btn">Create</string>
+    <string name="bind_account_create_new_text">Please enter your email address below to continue.</string>
+    <string name="bind_account_create_new_btn">Submit</string>
     <string name="bind_account_bind_text">Already have an existing Kdan account? Connect to %1$s</string>
     <string name="bind_account_bind_email_input_hint" translatable="false">@string/email_input_hint</string>
     <string name="bind_account_bind_btn">Connect</string>