Browse Source

Add res prefix

Wayne 6 years ago
parent
commit
9f489e1955
49 changed files with 503 additions and 503 deletions
  1. 4 4
      src/main/java/com/kdanmobile/kdanloginregisterui/BaseLoginView.kt
  2. 5 5
      src/main/java/com/kdanmobile/kdanloginregisterui/BaseRegisterView.kt
  3. 5 5
      src/main/java/com/kdanmobile/kdanloginregisterui/BindAccountView.kt
  4. 3 3
      src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailLoginFormView.kt
  5. 3 3
      src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailRegisterFormView.kt
  6. 1 1
      src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/EmailLoginBtn.kt
  7. 1 1
      src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/EmailRegisterBtn.kt
  8. 1 1
      src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/FacebookLoginBtn.kt
  9. 1 1
      src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/FacebookRegisterBtn.kt
  10. 1 1
      src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/GoogleLoginBtn.kt
  11. 1 1
      src/main/java/com/kdanmobile/kdanloginregisterui/widget/btn/GoogleRegisterBtn.kt
  12. 1 1
      src/main/res/drawable/bg_bind_account_bind_btn.xml
  13. 1 1
      src/main/res/drawable/bg_bind_account_create_btn.xml
  14. 1 1
      src/main/res/drawable/bg_email_btn.xml
  15. 1 1
      src/main/res/drawable/bg_email_login_register_form_edit_text_focused.xml
  16. 1 1
      src/main/res/drawable/bg_email_login_register_form_edit_text_normal.xml
  17. 1 1
      src/main/res/drawable/bg_email_login_register_form_submit_btn.xml
  18. 1 1
      src/main/res/drawable/bg_facebook_btn.xml
  19. 1 1
      src/main/res/drawable/bg_google_btn.xml
  20. 6 6
      src/main/res/layout-land/activity_login_a.xml
  21. 7 7
      src/main/res/layout-land/activity_login_b.xml
  22. 8 8
      src/main/res/layout-land/activity_register_a.xml
  23. 9 9
      src/main/res/layout-land/activity_register_b.xml
  24. 14 14
      src/main/res/layout/activity_bind_account.xml
  25. 12 12
      src/main/res/layout/activity_login_a.xml
  26. 13 13
      src/main/res/layout/activity_login_b.xml
  27. 12 12
      src/main/res/layout/activity_register_a.xml
  28. 14 14
      src/main/res/layout/activity_register_b.xml
  29. 5 5
      src/main/res/layout/btn_email_login_register.xml
  30. 5 5
      src/main/res/layout/btn_facebook_login_register.xml
  31. 5 5
      src/main/res/layout/btn_google_login_register.xml
  32. 1 1
      src/main/res/layout/dialog_email_login.xml
  33. 1 1
      src/main/res/layout/dialog_email_register.xml
  34. 3 3
      src/main/res/layout/edit_text_pwd.xml
  35. 8 8
      src/main/res/layout/view_email_login_form.xml
  36. 6 6
      src/main/res/layout/view_email_register_form.xml
  37. 27 27
      src/main/res/values-de/strings.xml
  38. 28 28
      src/main/res/values-es/strings.xml
  39. 28 28
      src/main/res/values-fr/strings.xml
  40. 27 27
      src/main/res/values-it/strings.xml
  41. 28 28
      src/main/res/values-ja/strings.xml
  42. 27 27
      src/main/res/values-ko/strings.xml
  43. 28 28
      src/main/res/values-pt/strings.xml
  44. 27 27
      src/main/res/values-ru/strings.xml
  45. 28 28
      src/main/res/values-zh-rTW/strings.xml
  46. 28 28
      src/main/res/values-zh/strings.xml
  47. 15 15
      src/main/res/values/colors.xml
  48. 10 10
      src/main/res/values/dimens.xml
  49. 39 39
      src/main/res/values/strings.xml

+ 4 - 4
src/main/java/com/kdanmobile/kdanloginregisterui/BaseLoginView.kt

@@ -28,9 +28,9 @@ open abstract class BaseLoginView @JvmOverloads constructor(
     lateinit var onClickClose: Runnable
 
     protected fun setupTosAndPpTextView(textView: TextView) {
-        val tos = context.getString(R.string.terms_of_service)
-        val pp = context.getString(R.string.privacy_policy)
-        val textColor = resources.getColor(R.color.tos_pp_text)
+        val tos = context.getString(R.string.kdanlrui_terms_of_service)
+        val pp = context.getString(R.string.kdanlrui_privacy_policy)
+        val textColor = resources.getColor(R.color.kdanlrui_tos_pp_text)
         val tosSS = tos.toSpannable(textColor, false, View.OnClickListener { v -> onClickTurnOfService.run() })
         val ppSS = pp.toSpannable(textColor, false, View.OnClickListener { v -> onClickPrivacyPolicy.run() })
         textView.apply {
@@ -43,7 +43,7 @@ open abstract class BaseLoginView @JvmOverloads constructor(
 
     protected fun setupSwitchTextView(textView: TextView) {
         val s = textView.text
-        val textColor = resources.getColor(R.color.switch_text)
+        val textColor = resources.getColor(R.color.kdanlrui_switch_text)
         val ss = s.toSpannable(textColor, true, View.OnClickListener { v -> onClickSwitchToRegister.run() })
         textView.apply {
             movementMethod = LinkMovementMethod.getInstance()

+ 5 - 5
src/main/java/com/kdanmobile/kdanloginregisterui/BaseRegisterView.kt

@@ -28,7 +28,7 @@ open abstract class BaseRegisterView @JvmOverloads constructor(
 
     protected fun setupSwitchTextView(textView: TextView) {
         val s = textView.text
-        val textColor = resources.getColor(R.color.switch_text)
+        val textColor = resources.getColor(R.color.kdanlrui_switch_text)
         val ss = s.toSpannable(textColor, true, View.OnClickListener { onClickSwitchToLogin.run() })
         textView.apply {
             movementMethod = LinkMovementMethod.getInstance()
@@ -39,11 +39,11 @@ open abstract class BaseRegisterView @JvmOverloads constructor(
     protected fun setupTosAndPpTextView(textView: TextView) {
         try {
             val key = "[d*_*b]"
-            val tos = context.getString(R.string.terms_of_service)
-            val pp = context.getString(R.string.privacy_policy)
-            val pattern = context.getString(R.string.register_tos_and_pp_pattern, key, key)
+            val tos = context.getString(R.string.kdanlrui_terms_of_service)
+            val pp = context.getString(R.string.kdanlrui_privacy_policy)
+            val pattern = context.getString(R.string.kdanlrui_register_tos_and_pp_pattern, key, key)
             val stringArray = pattern.split(key)
-            val textColor = resources.getColor(R.color.tos_pp_text)
+            val textColor = resources.getColor(R.color.kdanlrui_tos_pp_text)
             val tosSS = tos.toSpannable(textColor, false, View.OnClickListener { onClickTurnOfService.run() })
             val ppSS = pp.toSpannable(textColor, false, View.OnClickListener { onClickPrivacyPolicy.run() })
             textView.apply {

+ 5 - 5
src/main/java/com/kdanmobile/kdanloginregisterui/BindAccountView.kt

@@ -34,15 +34,15 @@ class BindAccountView @JvmOverloads constructor(
     }
 
     fun setThirdPtyName(name: String) {
-        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)
+        tv_bindAccount_bind.text = context.getString(R.string.kdanlrui_bind_account_bind_text, name)
+        tv_bindAccount_bindExplanation.text = context.getString(R.string.kdanlrui_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)
+            false -> context.getString(R.string.kdanlrui_email_login_register_dialog_email_error)
         }
         if (isEmailValid) {
             onClickCreate.run()
@@ -54,11 +54,11 @@ class BindAccountView @JvmOverloads constructor(
         val isPwdValid = !TextUtils.isEmpty(existingPwd)
         et_bindAccount_existingEmail.error = when {
             isEmailValid -> null
-            else -> context.getString(R.string.email_login_register_dialog_email_error)
+            else -> context.getString(R.string.kdanlrui_email_login_register_dialog_email_error)
         }
         et_bindAccount_existingPwd.error = when {
             isPwdValid -> null
-            else -> context.getString(R.string.email_login_register_dialog_pwd_error)
+            else -> context.getString(R.string.kdanlrui_email_login_register_dialog_pwd_error)
         }
         if (isEmailValid && isPwdValid) {
             onClickConnect.run()

+ 3 - 3
src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailLoginFormView.kt

@@ -43,18 +43,18 @@ class EmailLoginFormView @JvmOverloads constructor(
         val isPwdValid = !TextUtils.isEmpty(pwd) && pwd.length >= Config.PWD_MIN_LENGTH
         et_emailLoginForm_email.error = when {
             isEmailValid -> null
-            else -> context.getString(R.string.email_login_register_dialog_email_error)
+            else -> context.getString(R.string.kdanlrui_email_login_register_dialog_email_error)
         }
         et_emailLoginForm_pwd.error = when {
             isPwdValid -> null
-            else -> context.getString(R.string.email_login_register_dialog_pwd_error)
+            else -> context.getString(R.string.kdanlrui_email_login_register_dialog_pwd_error)
         }
         if (isEmailValid && isPwdValid)
             onSubmit?.run()
     }
 
     private fun setupPwdHelpTv() {
-        val textColor = resources.getColor(R.color.email_login_pwd_helper)
+        val textColor = resources.getColor(R.color.kdanlrui_email_login_pwd_helper)
         val isUnderLine = true
         val onClick = OnClickListener {} // Cannot work, don't know why.
         val s = tv_emailLogin_pwdHelp.text

+ 3 - 3
src/main/java/com/kdanmobile/kdanloginregisterui/widget/EmailRegisterFormView.kt

@@ -41,15 +41,15 @@ class EmailRegisterFormView @JvmOverloads constructor(
         val isPwdValid = !TextUtils.isEmpty(pwd) && pwd.length >= PWD_MIN_LENGTH
         et_emailRegisterForm_name.error = when {
             isNameValid -> null
-            else -> context.getString(R.string.email_login_register_dialog_name_error)
+            else -> context.getString(R.string.kdanlrui_email_login_register_dialog_name_error)
         }
         et_emailRegisterForm_email.error = when {
             isEmailValid -> null
-            else -> context.getString(R.string.email_login_register_dialog_email_error)
+            else -> context.getString(R.string.kdanlrui_email_login_register_dialog_email_error)
         }
         et_emailRegisterForm_pwd.error = when {
             isPwdValid -> null
-            else -> context.getString(R.string.email_login_register_dialog_pwd_error)
+            else -> context.getString(R.string.kdanlrui_email_login_register_dialog_pwd_error)
         }
         if (isNameValid && isEmailValid && isPwdValid)
             onSubmit?.run()

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

@@ -10,6 +10,6 @@ class EmailLoginBtn @JvmOverloads constructor(
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) : BaseEmailBtn(context, attrs, defStyleAttr) {
     init {
-        tv_emailLoginRegisterBtn_text.setText(R.string.signIn_email)
+        tv_emailLoginRegisterBtn_text.setText(R.string.kdanlrui_signIn_email)
     }
 }

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

@@ -10,6 +10,6 @@ class EmailRegisterBtn @JvmOverloads constructor(
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) : BaseEmailBtn(context, attrs, defStyleAttr) {
     init {
-        tv_emailLoginRegisterBtn_text.setText(R.string.signUp_email)
+        tv_emailLoginRegisterBtn_text.setText(R.string.kdanlrui_signUp_email)
     }
 }

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

@@ -10,6 +10,6 @@ class FacebookLoginBtn @JvmOverloads constructor(
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) : BaseFacebookBtn(context, attrs, defStyleAttr) {
     init {
-        tv_facebookLoginRegisterBtn_text.setText(R.string.signIn_facebook)
+        tv_facebookLoginRegisterBtn_text.setText(R.string.kdanlrui_signIn_facebook)
     }
 }

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

@@ -10,6 +10,6 @@ class FacebookRegisterBtn @JvmOverloads constructor(
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) : BaseFacebookBtn(context, attrs, defStyleAttr) {
     init {
-        tv_facebookLoginRegisterBtn_text.setText(R.string.signUp_facebook)
+        tv_facebookLoginRegisterBtn_text.setText(R.string.kdanlrui_signUp_facebook)
     }
 }

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

@@ -10,6 +10,6 @@ class GoogleLoginBtn @JvmOverloads constructor(
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) : BaseGoogleBtn(context, attrs, defStyleAttr) {
     init {
-        tv_googleLoginRegisterBtn_text.setText(R.string.signIn_google)
+        tv_googleLoginRegisterBtn_text.setText(R.string.kdanlrui_signIn_google)
     }
 }

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

@@ -10,6 +10,6 @@ class GoogleRegisterBtn @JvmOverloads constructor(
         attrs: AttributeSet? = null,
         defStyleAttr: Int = 0) : BaseGoogleBtn(context, attrs, defStyleAttr) {
     init {
-        tv_googleLoginRegisterBtn_text.setText(R.string.signUp_google)
+        tv_googleLoginRegisterBtn_text.setText(R.string.kdanlrui_signUp_google)
     }
 }

+ 1 - 1
src/main/res/drawable/bg_bind_account_bind_btn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:width="1dp" android:color="@color/kdan_green" />
+    <solid android:width="1dp" android:color="@color/kdanlrui_kdan_green" />
     <corners android:radius="2dp"/>
 </shape>

+ 1 - 1
src/main/res/drawable/bg_bind_account_create_btn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:width="1dp" android:color="@color/form_primary_blue" />
+    <solid android:width="1dp" android:color="@color/kdanlrui_form_primary_blue" />
     <corners android:radius="2dp"/>
 </shape>

+ 1 - 1
src/main/res/drawable/bg_email_btn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke android:width="1dp" android:color="@color/kdan_blue" />
+    <stroke android:width="1dp" android:color="@color/kdanlrui_kdan_blue" />
     <corners android:radius="2dp"/>
 </shape>

+ 1 - 1
src/main/res/drawable/bg_email_login_register_form_edit_text_focused.xml

@@ -4,7 +4,7 @@
 
     <stroke
         android:width="1dp"
-        android:color="@color/email_login_register_form_primary_blue" />
+        android:color="@color/kdanlrui_email_login_register_form_primary_blue" />
 
     <solid android:color="#fff"/>
     

+ 1 - 1
src/main/res/drawable/bg_email_login_register_form_edit_text_normal.xml

@@ -3,6 +3,6 @@
     android:shape="rectangle" >
     <stroke
         android:width="1dp"
-        android:color="@color/email_login_register_form_input_border" />
+        android:color="@color/kdanlrui_email_login_register_form_input_border" />
     <solid android:color="#fff"/>
 </shape>

+ 1 - 1
src/main/res/drawable/bg_email_login_register_form_submit_btn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/email_login_register_form_primary_blue" />
+    <solid android:color="@color/kdanlrui_email_login_register_form_primary_blue" />
     <corners android:radius="2dp"/>
 </shape>

+ 1 - 1
src/main/res/drawable/bg_facebook_btn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/facebook_blue"/>
+    <solid android:color="@color/kdanlrui_facebook_blue"/>
     <corners android:radius="2dp"/>
 </shape>

+ 1 - 1
src/main/res/drawable/bg_google_btn.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/google_blue"/>
+    <solid android:color="@color/kdanlrui_google_blue"/>
     <corners android:radius="2dp"/>
 </shape>

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

@@ -40,7 +40,7 @@
                 android:id="@+id/btn_loginA_close"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -54,7 +54,7 @@
                 android:id="@+id/iv_loginA_kdanCloud"
                 android:src="@drawable/kdancloud"
                 android:scaleType="centerCrop"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="117dp"
                 android:layout_height="78dp"
                 android:layout_marginRight="84dp"
@@ -79,7 +79,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleLoginBtn
                 android:id="@+id/view_loginA_googleLogin"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -104,7 +104,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:textSize="@dimen/tos_and_pp_text_size"
+                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"
@@ -123,8 +123,8 @@
 
             <TextView
                 android:id="@+id/tv_loginA_switchToRegister"
-                android:text="@string/switch_to_register"
-                android:textColor="@color/switch_text"
+                android:text="@string/kdanlrui_switch_to_register"
+                android:textColor="@color/kdanlrui_switch_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"

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

@@ -50,7 +50,7 @@
                 android:id="@+id/btn_loginB_close"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -64,7 +64,7 @@
                 android:id="@+id/iv_loginB_kdanCloud"
                 android:src="@drawable/kdancloud"
                 android:scaleType="centerCrop"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="117dp"
                 android:layout_height="78dp"
                 android:layout_marginRight="74dp"
@@ -77,8 +77,8 @@
 
             <TextView
                 android:id="@+id/tv_loginB_switchToRegister"
-                android:text="@string/switch_to_register"
-                android:textColor="@color/switch_text"
+                android:text="@string/kdanlrui_switch_to_register"
+                android:textColor="@color/kdanlrui_switch_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="36dp"
@@ -101,7 +101,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleLoginBtn
                 android:id="@+id/view_loginB_googleLogin"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -112,7 +112,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.EmailLoginBtn
                 android:id="@+id/view_loginB_emailLogin"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -125,7 +125,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:textSize="@dimen/tos_and_pp_text_size"
+                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"

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

@@ -40,7 +40,7 @@
                 android:id="@+id/btn_registerA_close"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -54,7 +54,7 @@
                 android:id="@+id/iv_registerA_kdanCloud"
                 android:src="@drawable/kdancloud"
                 android:scaleType="centerCrop"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="117dp"
                 android:layout_height="78dp"
                 android:layout_marginRight="84dp"
@@ -70,8 +70,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
-                android:text="@string/register_title"
-                android:textColor="@color/register_title"
+                android:text="@string/kdanlrui_register_title"
+                android:textColor="@color/kdanlrui_register_title"
                 android:textSize="16sp"
                 android:textStyle="bold"
                 android:layout_marginTop="4dp"
@@ -95,7 +95,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleRegisterBtn
                 android:id="@+id/view_registerA_googleRegister"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -120,7 +120,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:textSize="@dimen/tos_and_pp_text_size"
+                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"
@@ -143,8 +143,8 @@
                 android:layout_height="19dp"
                 android:layout_marginTop="16dp"
                 android:layout_marginBottom="24dp"
-                android:text="@string/switch_to_login"
-                android:textColor="@color/switch_text"
+                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"

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

@@ -50,7 +50,7 @@
                 android:id="@+id/btn_registerB_close"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -64,7 +64,7 @@
                 android:id="@+id/iv_registerB_kdanCloud"
                 android:src="@drawable/kdancloud"
                 android:scaleType="centerCrop"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="117dp"
                 android:layout_height="78dp"
                 android:layout_marginRight="74dp"
@@ -81,8 +81,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
                 android:gravity="center"
-                android:text="@string/register_title"
-                android:textColor="@color/register_title"
+                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"
@@ -93,8 +93,8 @@
 
             <TextView
                 android:id="@+id/tv_registerB_switchToLogin"
-                android:text="@string/switch_to_login"
-                android:textColor="@color/switch_text"
+                android:text="@string/kdanlrui_switch_to_login"
+                android:textColor="@color/kdanlrui_switch_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="10dp"
@@ -117,7 +117,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleRegisterBtn
                 android:id="@+id/view_registerB_googleRegister"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -128,7 +128,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.EmailRegisterBtn
                 android:id="@+id/view_registerB_emailRegister"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -141,7 +141,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:textSize="@dimen/tos_and_pp_text_size"
+                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"

+ 14 - 14
src/main/res/layout/activity_bind_account.xml

@@ -50,7 +50,7 @@
                 android:id="@+id/btn_bindAccount_back"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_arrow_back_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -66,7 +66,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="24dp"
                 android:gravity="center_vertical|left"
-                android:text="@string/bind_account_create_new_text"
+                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"
@@ -77,7 +77,7 @@
                 android:id="@+id/et_bindAccount_newEmail"
                 style="@style/EmailLoginRegisterFormEditText"
                 android:inputType="textEmailAddress"
-                android:hint="@string/email_input_hint"
+                android:hint="@string/kdanlrui_email_input_hint"
                 android:layout_width="0dp"
                 android:layout_height="44dp"
                 android:layout_marginTop="12dp"
@@ -89,7 +89,7 @@
 
             <Button
                 android:id="@+id/btn_bindAccount_create"
-                android:text="@string/bind_account_create_new_btn"
+                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"
@@ -104,9 +104,9 @@
 
             <TextView
                 android:id="@+id/tv_bindAccount_orDivider"
-                android:text="@string/or"
-                android:textSize="@dimen/or_divider_text_size"
-                android:textColor="@color/or_diver"
+                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"
@@ -117,7 +117,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginRight="16dp"
@@ -129,7 +129,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginLeft="16dp"
@@ -142,7 +142,7 @@
 
             <TextView
                 android:id="@+id/tv_bindAccount_bind"
-                android:text="@string/bind_account_bind_text"
+                android:text="@string/kdanlrui_bind_account_bind_text"
                 android:gravity="center_vertical|left"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
@@ -157,7 +157,7 @@
                 android:id="@+id/et_bindAccount_existingEmail"
                 style="@style/EmailLoginRegisterFormEditText"
                 android:inputType="textEmailAddress"
-                android:hint="@string/email_input_hint"
+                android:hint="@string/kdanlrui_email_input_hint"
                 android:layout_width="0dp"
                 android:layout_height="44dp"
                 android:layout_marginTop="12dp"
@@ -171,7 +171,7 @@
                 android:id="@+id/et_bindAccount_existingPwd"
                 style="@style/EmailLoginRegisterFormEditText"
                 android:inputType="textPassword"
-                android:hint="@string/pwd_input_hint"
+                android:hint="@string/kdanlrui_pwd_input_hint"
                 android:layout_width="0dp"
                 android:layout_height="44dp"
                 android:layout_marginTop="8dp"
@@ -183,7 +183,7 @@
 
             <Button
                 android:id="@+id/btn_bindAccount_bind"
-                android:text="@string/bind_account_bind_btn"
+                android:text="@string/kdanlrui_bind_account_bind_btn"
                 android:textSize="14sp"
                 android:textColor="@android:color/white"
                 android:background="@drawable/bg_bind_account_bind_btn"
@@ -199,7 +199,7 @@
             <TextView
                 android:visibility="gone"
                 android:id="@+id/tv_bindAccount_bindExplanation"
-                android:text="@string/bind_account_bind_explanation"
+                android:text="@string/kdanlrui_bind_account_bind_explanation"
                 android:gravity="center_vertical|left"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"

+ 12 - 12
src/main/res/layout/activity_login_a.xml

@@ -50,7 +50,7 @@
                 android:id="@+id/btn_loginA_close"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -64,7 +64,7 @@
                 android:id="@+id/iv_loginA_kdanCloud"
                 android:src="@drawable/kdancloud"
                 android:scaleType="centerCrop"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="116dp"
                 android:layout_height="77dp"
                 android:layout_marginTop="48dp"
@@ -88,9 +88,9 @@
 
             <TextView
                 android:id="@+id/tv_loginA_orDivider"
-                android:text="@string/or"
-                android:textSize="@dimen/or_divider_text_size"
-                android:textColor="@color/or_diver"
+                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"
@@ -101,7 +101,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginRight="16dp"
@@ -113,7 +113,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginLeft="16dp"
@@ -127,7 +127,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookLoginBtn
                 android:id="@+id/view_loginA_fbLogin"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -138,7 +138,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleLoginBtn
                 android:id="@+id/view_loginA_googleLogin"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -151,8 +151,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
-                android:text="@string/switch_to_register"
-                android:textColor="@color/switch_text"
+                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"
@@ -162,7 +162,7 @@
             <TextView
                 android:id="@+id/tv_loginA_tosAndPp"
                 tools:text="Our terms of service and privacy policy."
-                android:textSize="@dimen/tos_and_pp_text_size"
+                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"

+ 13 - 13
src/main/res/layout/activity_login_b.xml

@@ -50,7 +50,7 @@
                 android:id="@+id/btn_loginB_close"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -64,7 +64,7 @@
                 android:id="@+id/iv_loginB_kdanCloud"
                 android:src="@drawable/kdancloud"
                 android:scaleType="centerCrop"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="116dp"
                 android:layout_height="77dp"
                 android:layout_marginTop="70dp"
@@ -78,7 +78,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookLoginBtn
                 android:id="@+id/view_loginB_fbLogin"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -89,7 +89,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleLoginBtn
                 android:id="@+id/view_loginB_googleLogin"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -99,9 +99,9 @@
 
             <TextView
                 android:id="@+id/tv_loginB_orDivider"
-                android:text="@string/or"
-                android:textSize="@dimen/or_divider_text_size"
-                android:textColor="@color/or_diver"
+                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"
@@ -112,7 +112,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginRight="16dp"
@@ -124,7 +124,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginLeft="16dp"
@@ -138,7 +138,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.EmailLoginBtn
                 android:id="@+id/view_loginB_emailLogin"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -151,8 +151,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:text="@string/switch_to_register"
-                android:textColor="@color/switch_text"
+                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"
@@ -162,7 +162,7 @@
             <TextView
                 android:id="@+id/tv_loginB_tosAndPp"
                 tools:text="Our terms of service and privacy policy."
-                android:textSize="@dimen/tos_and_pp_text_size"
+                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="134dp"

+ 12 - 12
src/main/res/layout/activity_register_a.xml

@@ -50,7 +50,7 @@
                 android:id="@+id/btn_registerA_close"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -64,7 +64,7 @@
                 android:id="@+id/iv_registerA_kdanCloud"
                 android:src="@drawable/kdancloud"
                 android:scaleType="centerCrop"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="116dp"
                 android:layout_height="77dp"
                 android:layout_marginTop="48dp"
@@ -88,9 +88,9 @@
 
             <TextView
                 android:id="@+id/tv_registerA_orDivider"
-                android:text="@string/or"
-                android:textSize="@dimen/or_divider_text_size"
-                android:textColor="@color/or_diver"
+                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"
@@ -101,7 +101,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginRight="16dp"
@@ -113,7 +113,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginLeft="16dp"
@@ -127,7 +127,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookRegisterBtn
                 android:id="@+id/view_registerA_fbRegister"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -138,7 +138,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleRegisterBtn
                 android:id="@+id/view_registerA_googleRegister"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -151,8 +151,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"
-                android:text="@string/switch_to_login"
-                android:textColor="@color/switch_text"
+                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"
@@ -162,7 +162,7 @@
             <TextView
                 android:id="@+id/tv_registerA_tosAndPp"
                 tools:text="Our terms of service and privacy policy."
-                android:textSize="@dimen/tos_and_pp_text_size"
+                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp"

+ 14 - 14
src/main/res/layout/activity_register_b.xml

@@ -50,7 +50,7 @@
                 android:id="@+id/btn_registerB_close"
                 android:background="?android:attr/selectableItemBackground"
                 android:src="@drawable/ic_close_blue_24dp"
-                android:contentDescription="@string/emptyImageContextDescription"
+                android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="4dp"
@@ -66,8 +66,8 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="96dp"
                 android:gravity="center"
-                android:text="@string/register_title"
-                android:textColor="@color/register_title"
+                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"
@@ -79,7 +79,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.FacebookRegisterBtn
                 android:id="@+id/view_registerB_fbRegister"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -90,7 +90,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.GoogleRegisterBtn
                 android:id="@+id/view_registerB_googleRegister"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -100,9 +100,9 @@
 
             <TextView
                 android:id="@+id/tv_registerB_orDivider"
-                android:text="@string/or"
-                android:textSize="@dimen/or_divider_text_size"
-                android:textColor="@color/or_diver"
+                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"
@@ -113,7 +113,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginRight="16dp"
@@ -125,7 +125,7 @@
                 />
 
             <View
-                android:background="@color/or_diver"
+                android:background="@color/kdanlrui_or_diver"
                 android:layout_width="0dp"
                 android:layout_height="1dp"
                 android:layout_marginLeft="16dp"
@@ -139,7 +139,7 @@
             <com.kdanmobile.kdanloginregisterui.widget.btn.EmailRegisterBtn
                 android:id="@+id/view_registerB_emailRegister"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/login_register_btn_height"
+                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"
@@ -152,8 +152,8 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
-                android:text="@string/switch_to_login"
-                android:textColor="@color/switch_text"
+                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"
@@ -163,7 +163,7 @@
             <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/tos_and_pp_text_size"
+                android:textSize="@dimen/kdanlrui_tos_and_pp_text_size"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="134dp"

+ 5 - 5
src/main/res/layout/btn_email_login_register.xml

@@ -3,7 +3,7 @@
     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/login_register_btn_height"
+    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
     android:foreground="?attr/selectableItemBackground"
     android:background="@drawable/bg_email_btn"
     >
@@ -12,7 +12,7 @@
         android:id="@+id/iv_emailLoginRegisterBtn_ic"
         android:src="@drawable/btn_icon_mail"
         android:scaleType="centerCrop"
-        android:contentDescription="@string/emptyImageContextDescription"
+        android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="1dp"
@@ -24,9 +24,9 @@
 
     <TextView
         android:id="@+id/tv_emailLoginRegisterBtn_text"
-        android:text="@string/signIn_email"
-        android:textColor="@color/kdan_blue"
-        android:textSize="@dimen/login_register_text_size"
+        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"

+ 5 - 5
src/main/res/layout/btn_facebook_login_register.xml

@@ -3,7 +3,7 @@
     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/login_register_btn_height"
+    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
     android:foreground="?attr/selectableItemBackground"
     android:background="@drawable/bg_facebook_btn"
     >
@@ -12,7 +12,7 @@
         android:id="@+id/iv_facebookLoginRegisterBtn_ic"
         android:src="@drawable/btn_icon_fb"
         android:scaleType="centerCrop"
-        android:contentDescription="@string/emptyImageContextDescription"
+        android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="1dp"
@@ -24,9 +24,9 @@
 
     <TextView
         android:id="@+id/tv_facebookLoginRegisterBtn_text"
-        android:text="@string/signIn_facebook"
-        android:textColor="@color/third_party_btn_text"
-        android:textSize="@dimen/login_register_text_size"
+        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"

+ 5 - 5
src/main/res/layout/btn_google_login_register.xml

@@ -3,7 +3,7 @@
     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/login_register_btn_height"
+    android:layout_height="@dimen/kdanlrui_login_register_btn_height"
     android:foreground="?attr/selectableItemBackground"
     android:background="@drawable/bg_google_btn"
     >
@@ -12,7 +12,7 @@
         android:id="@+id/iv_googleLoginRegisterBtn_ic"
         android:src="@drawable/btn_icon_google"
         android:scaleType="centerCrop"
-        android:contentDescription="@string/emptyImageContextDescription"
+        android:contentDescription="@string/kdanlrui_emptyImageContextDescription"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="1dp"
@@ -24,9 +24,9 @@
 
     <TextView
         android:id="@+id/tv_googleLoginRegisterBtn_text"
-        android:text="@string/signIn_google"
-        android:textColor="@color/third_party_btn_text"
-        android:textSize="@dimen/login_register_text_size"
+        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"

+ 1 - 1
src/main/res/layout/dialog_email_login.xml

@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/email_login_register_form_bg"
+    android:background="@color/kdanlrui_email_login_register_form_bg"
     >
 
     <android.support.constraint.Guideline

+ 1 - 1
src/main/res/layout/dialog_email_register.xml

@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/email_login_register_form_bg"
+    android:background="@color/kdanlrui_email_login_register_form_bg"
     >
 
     <android.support.constraint.Guideline

+ 3 - 3
src/main/res/layout/edit_text_pwd.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/email_login_dialog_field_height"
+    android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <EditText
         android:id="@+id/et_pwdEditText_pwd"
         style="@style/EmailLoginRegisterFormEditText"
         android:inputType="textPassword"
-        android:hint="@string/email_login_register_dialog_password_edit_text_hint"
+        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"
@@ -19,7 +19,7 @@
 
     <TextView
         android:id="@+id/tv_pwdEditText_minimumHint"
-        android:text="@string/email_login_register_dialog_password_edit_text_hint_minimum"
+        android:text="@string/kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum"
         android:textSize="10sp"
         android:textColor="#aeaeae"
         android:layout_width="wrap_content"

+ 8 - 8
src/main/res/layout/view_email_login_form.xml

@@ -9,9 +9,9 @@
         android:id="@+id/et_emailLoginForm_email"
         style="@style/EmailLoginRegisterFormEditText"
         android:inputType="textEmailAddress"
-        android:hint="@string/email_login_register_dialog_email_edit_text_hint"
+        android:hint="@string/kdanlrui_email_login_register_dialog_email_edit_text_hint"
         android:layout_width="0dp"
-        android:layout_height="@dimen/email_login_dialog_field_height"
+        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"
@@ -22,7 +22,7 @@
     <com.kdanmobile.kdanloginregisterui.widget.PwdEditText
         android:id="@+id/et_emailLoginForm_pwd"
         android:layout_width="0dp"
-        android:layout_height="@dimen/email_login_dialog_field_height"
+        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
         android:layout_marginTop="10dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -39,9 +39,9 @@
 
     <android.support.v7.widget.AppCompatCheckBox
         android:id="@+id/cb_emailLogin_rememberMe"
-        android:text="@string/email_login_remember_me_check_box"
+        android:text="@string/kdanlrui_email_login_remember_me_check_box"
         android:textSize="12sp"
-        android:buttonTint="@color/email_login_register_form_primary_blue"
+        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"
@@ -51,8 +51,8 @@
 
     <TextView
         android:id="@+id/tv_emailLogin_pwdHelp"
-        android:text="@string/email_login_pwd_help"
-        android:textColor="@color/email_login_pwd_helper"
+        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"
@@ -64,7 +64,7 @@
     <Button
         android:id="@+id/btn_emailLoginForm_login"
         style="@style/EmailLoginRegisterFormSubmitBtn"
-        android:text="@string/email_register_dialog_submit_btn"
+        android:text="@string/kdanlrui_email_register_dialog_submit_btn"
         android:layout_width="0dp"
         android:layout_height="36dp"
         android:layout_marginTop="46dp"

+ 6 - 6
src/main/res/layout/view_email_register_form.xml

@@ -9,9 +9,9 @@
         android:id="@+id/et_emailRegisterForm_name"
         style="@style/EmailLoginRegisterFormEditText"
         android:inputType="text"
-        android:hint="@string/email_login_register_dialog_name_edit_text_hint"
+        android:hint="@string/kdanlrui_email_login_register_dialog_name_edit_text_hint"
         android:layout_width="0dp"
-        android:layout_height="@dimen/email_login_dialog_field_height"
+        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"
@@ -23,9 +23,9 @@
         android:id="@+id/et_emailRegisterForm_email"
         style="@style/EmailLoginRegisterFormEditText"
         android:inputType="textEmailAddress"
-        android:hint="@string/email_login_register_dialog_email_edit_text_hint"
+        android:hint="@string/kdanlrui_email_login_register_dialog_email_edit_text_hint"
         android:layout_width="0dp"
-        android:layout_height="@dimen/email_login_dialog_field_height"
+        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
         android:layout_marginTop="10dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -36,7 +36,7 @@
     <com.kdanmobile.kdanloginregisterui.widget.PwdEditText
         android:id="@+id/et_emailRegisterForm_pwd"
         android:layout_width="0dp"
-        android:layout_height="@dimen/email_login_dialog_field_height"
+        android:layout_height="@dimen/kdanlrui_email_login_dialog_field_height"
         android:layout_marginTop="10dp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -47,7 +47,7 @@
     <Button
         android:id="@+id/btn_emailRegisterForm_submit"
         style="@style/EmailLoginRegisterFormSubmitBtn"
-        android:text="@string/email_register_dialog_submit_btn"
+        android:text="@string/kdanlrui_email_register_dialog_submit_btn"
         android:layout_width="0dp"
         android:layout_height="36dp"
         android:layout_marginTop="20dp"

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

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="or">oder</string>
-	<string name="email_input_hint">E-Mail Adresse</string>
-	<string name="pwd_input_hint">Passwort</string>
-	<string name="register_title">Werden Sie kostenloses Mitglied bei Kdan</string>
-	<string name="signIn_facebook">Mit Facebook anmelden</string>
-	<string name="signIn_google">Mit Google anmelden</string>
-	<string name="signIn_email">Über E-Mail anmelden</string>
-	<string name="signUp_facebook">Weiter mit Facebook</string>
-	<string name="signUp_google">Weiter mit Google</string>
-	<string name="signUp_email">Weiter mit E-Mail-Adresse</string>
-	<string name="switch_to_register">Konto erstellen</string>
-	<string name="switch_to_login">Ich habe bereits ein Kdan-Konto</string>
-	<string name="terms_of_service">Dienstleistungsbedingungen</string>
-	<string name="privacy_policy">Datenschutzerklärung</string>
-	<string name="email_login_register_dialog_name_edit_text_hint">Name</string>
-	<string name="email_login_register_dialog_password_edit_text_hint_minimum">(Mindestens 8 Zeichen)</string>
-	<string name="email_login_register_dialog_name_error">ungültiger Name</string>
-	<string name="email_login_register_dialog_email_error">Ungültige E-mail</string>
-	<string name="email_login_register_dialog_pwd_error">Ungültiges Passwort</string>
-	<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">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>
+	<string name="kdanlrui_or">oder</string>
+	<string name="kdanlrui_email_input_hint">E-Mail Adresse</string>
+	<string name="kdanlrui_pwd_input_hint">Passwort</string>
+	<string name="kdanlrui_register_title">Werden Sie kostenloses Mitglied bei Kdan</string>
+	<string name="kdanlrui_signIn_facebook">Mit Facebook anmelden</string>
+	<string name="kdanlrui_signIn_google">Mit Google anmelden</string>
+	<string name="kdanlrui_signIn_email">Über E-Mail anmelden</string>
+	<string name="kdanlrui_signUp_facebook">Weiter mit Facebook</string>
+	<string name="kdanlrui_signUp_google">Weiter mit Google</string>
+	<string name="kdanlrui_signUp_email">Weiter mit E-Mail-Adresse</string>
+	<string name="kdanlrui_switch_to_register">Konto erstellen</string>
+	<string name="kdanlrui_switch_to_login">Ich habe bereits ein Kdan-Konto</string>
+	<string name="kdanlrui_terms_of_service">Dienstleistungsbedingungen</string>
+	<string name="kdanlrui_privacy_policy">Datenschutzerklärung</string>
+	<string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">Name</string>
+	<string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(Mindestens 8 Zeichen)</string>
+	<string name="kdanlrui_email_login_register_dialog_name_error">ungültiger Name</string>
+	<string name="kdanlrui_email_login_register_dialog_email_error">Ungültige E-mail</string>
+	<string name="kdanlrui_email_login_register_dialog_pwd_error">Ungültiges Passwort</string>
+	<string name="kdanlrui_email_login_remember_me_check_box">Login speichern</string>
+	<string name="kdanlrui_email_login_pwd_help">Passwort Hilfe</string>
+	<string name="kdanlrui_email_register_dialog_submit_btn">Absenden</string>
+	<string name="kdanlrui_bind_account_create_new_text">Bitte geben Sie unten Ihre E-Mail-Adresse ein.</string>
+	<string name="kdanlrui_bind_account_create_new_btn">Absenden</string>
+	<string name="kdanlrui_bind_account_bind_text">Haben Sie bereits ein Konto? Link zu meinem %1$s Konto.\"</string>
+	<string name="kdanlrui_bind_account_bind_btn">Verbinden</string>
+	<string name="kdanlrui_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>
 </resources>

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

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="or">o</string>
-    <string name="email_input_hint">Dirección de correo electrónico</string>
-    <string name="pwd_input_hint">Contraseña</string>
-    <string name="register_title">Únete gratis a Kdan</string>
-    <string name="signIn_facebook">Ingresar con Facebook</string>
-    <string name="signIn_google">Ingresar con Google</string>
-    <string name="signIn_email">Ingresar sesión con el correo</string>
-    <string name="signUp_facebook">Continuar con Facebook</string>
-    <string name="signUp_google">Continuar con Google</string>
-    <string name="signUp_email">Continuar con el correo</string>
-    <string name="switch_to_register">Crear una cuenta nueva</string>
-    <string name="switch_to_login">Ya tengo una cuenta Kdan</string>
-    <string name="terms_of_service">Términos de Servicio</string>
-    <string name="privacy_policy">Política de privacidad</string>
-    <string name="register_tos_and_pp_pattern">Al registrarse, acepta nuestros %1$s y haber leído nuestra %2$s.</string>
-    <string name="email_login_register_dialog_name_edit_text_hint">Nombre</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(Mínimo 8 caracteres)</string>
-    <string name="email_login_register_dialog_name_error">Nombre no válido</string>
-    <string name="email_login_register_dialog_email_error">Correo electrónico no válido</string>
-    <string name="email_login_register_dialog_pwd_error">Contraseña no válida</string>
-    <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">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>
+    <string name="kdanlrui_or">o</string>
+    <string name="kdanlrui_email_input_hint">Dirección de correo electrónico</string>
+    <string name="kdanlrui_pwd_input_hint">Contraseña</string>
+    <string name="kdanlrui_register_title">Únete gratis a Kdan</string>
+    <string name="kdanlrui_signIn_facebook">Ingresar con Facebook</string>
+    <string name="kdanlrui_signIn_google">Ingresar con Google</string>
+    <string name="kdanlrui_signIn_email">Ingresar sesión con el correo</string>
+    <string name="kdanlrui_signUp_facebook">Continuar con Facebook</string>
+    <string name="kdanlrui_signUp_google">Continuar con Google</string>
+    <string name="kdanlrui_signUp_email">Continuar con el correo</string>
+    <string name="kdanlrui_switch_to_register">Crear una cuenta nueva</string>
+    <string name="kdanlrui_switch_to_login">Ya tengo una cuenta Kdan</string>
+    <string name="kdanlrui_terms_of_service">Términos de Servicio</string>
+    <string name="kdanlrui_privacy_policy">Política de privacidad</string>
+    <string name="kdanlrui_register_tos_and_pp_pattern">Al registrarse, acepta nuestros %1$s y haber leído nuestra %2$s.</string>
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">Nombre</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(Mínimo 8 caracteres)</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">Nombre no válido</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">Correo electrónico no válido</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">Contraseña no válida</string>
+    <string name="kdanlrui_email_login_remember_me_check_box">Recuérdame</string>
+    <string name="kdanlrui_email_login_pwd_help">Ayuda de contraseña</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">Enviar</string>
+    <string name="kdanlrui_bind_account_create_new_text">Introduzca su dirección de correo electrónico a continuación para continuar.</string>
+    <string name="kdanlrui_bind_account_create_new_btn">Enviar</string>
+    <string name="kdanlrui_bind_account_bind_text">Ya tienes una cuenta? Enlace a mi cuenta de %1$s.</string>
+    <string name="kdanlrui_bind_account_bind_btn">Conectar</string>
+    <string name="kdanlrui_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>
 </resources>

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

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<string name="or">ou</string>
-	<string name="email_input_hint">Adresse email</string>
-	<string name="pwd_input_hint">Mot de passe</string>
-	<string name="register_title">Rejoignez Kdan gratuitement</string>
-	<string name="signIn_facebook">Se connecter avec Facebook</string>
-	<string name="signIn_google">Se connecter avec Google</string>
-	<string name="signIn_email">Se connecter avec une adresse e-mail</string>
-	<string name="signUp_facebook">Continuer avec Facebook</string>
-	<string name="signUp_google">Continuer avec Google</string>
-	<string name="signUp_email">Continuer avec une adresse e-mail</string>
-	<string name="switch_to_register">Créer un nouveau compte</string>
-	<string name="switch_to_login">Je possède déjà un compte Kdan</string>
-	<string name="terms_of_service">Conditions de service</string>
-	<string name="privacy_policy">Politique de confidentialité</string>
-	<string name="register_tos_and_pp_pattern">En vous inscrivant, vous acceptez nos %1$s et attestez que vous avez lu notre %2$s.</string>
-	<string name="email_login_register_dialog_name_edit_text_hint">Nom</string>
-	<string name="email_login_register_dialog_password_edit_text_hint_minimum">(8 caractères minimum)</string>
-	<string name="email_login_register_dialog_name_error">Nom invalide</string>
-	<string name="email_login_register_dialog_email_error">Adresse email non valide</string>
-	<string name="email_login_register_dialog_pwd_error">Mot de passe non valide</string>
-	<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">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>
+	<string name="kdanlrui_or">ou</string>
+	<string name="kdanlrui_email_input_hint">Adresse email</string>
+	<string name="kdanlrui_pwd_input_hint">Mot de passe</string>
+	<string name="kdanlrui_register_title">Rejoignez Kdan gratuitement</string>
+	<string name="kdanlrui_signIn_facebook">Se connecter avec Facebook</string>
+	<string name="kdanlrui_signIn_google">Se connecter avec Google</string>
+	<string name="kdanlrui_signIn_email">Se connecter avec une adresse e-mail</string>
+	<string name="kdanlrui_signUp_facebook">Continuer avec Facebook</string>
+	<string name="kdanlrui_signUp_google">Continuer avec Google</string>
+	<string name="kdanlrui_signUp_email">Continuer avec une adresse e-mail</string>
+	<string name="kdanlrui_switch_to_register">Créer un nouveau compte</string>
+	<string name="kdanlrui_switch_to_login">Je possède déjà un compte Kdan</string>
+	<string name="kdanlrui_terms_of_service">Conditions de service</string>
+	<string name="kdanlrui_privacy_policy">Politique de confidentialité</string>
+	<string name="kdanlrui_register_tos_and_pp_pattern">En vous inscrivant, vous acceptez nos %1$s et attestez que vous avez lu notre %2$s.</string>
+	<string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">Nom</string>
+	<string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(8 caractères minimum)</string>
+	<string name="kdanlrui_email_login_register_dialog_name_error">Nom invalide</string>
+	<string name="kdanlrui_email_login_register_dialog_email_error">Adresse email non valide</string>
+	<string name="kdanlrui_email_login_register_dialog_pwd_error">Mot de passe non valide</string>
+	<string name="kdanlrui_email_login_remember_me_check_box">Se souvenir de moi</string>
+	<string name="kdanlrui_email_login_pwd_help">Aide pour le Mot de passe</string>
+	<string name="kdanlrui_email_register_dialog_submit_btn">Soumettre</string>
+	<string name="kdanlrui_bind_account_create_new_text">Veuillez entrez votre adresse électronique ci-dessous pour continuer.</string>
+	<string name="kdanlrui_bind_account_create_new_btn">Soumettre</string>
+	<string name="kdanlrui_bind_account_bind_text">Vous avez déjà un compte? Link vers mon compte %1$s.</string>
+	<string name="kdanlrui_bind_account_bind_btn">Se connecter</string>
+	<string name="kdanlrui_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>
 </resources>

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

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="or">oppure</string>
-    <string name="email_input_hint">Indirizzo email</string>
-    <string name="pwd_input_hint">Password</string>
-    <string name="register_title">Partecipa a Kdan free</string>
-    <string name="signIn_facebook">Accedi con Facebook</string>
-    <string name="signIn_google">Accedi con Google</string>
-    <string name="signIn_email">Accedi con la tua email</string>
-    <string name="signUp_facebook">Continua con Facebook</string>
-    <string name="signUp_google">Continua con Google</string>
-    <string name="signUp_email">Continua con la tua email</string>
-    <string name="switch_to_login">Ho già un account Kdan</string>
-    <string name="switch_to_register">Crea un nuovo account</string>
-    <string name="terms_of_service">Termini di servizio</string>
-    <string name="privacy_policy">Politica sulla riservatezza</string>
-    <string name="email_login_register_dialog_name_edit_text_hint">Nome</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(minimo 8 caratteri)</string>
-    <string name="email_login_register_dialog_name_error">Nome non valido</string>
-    <string name="email_login_register_dialog_email_error">Email non valida</string>
-    <string name="email_login_register_dialog_pwd_error">Password non valida</string>
-    <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">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>
+    <string name="kdanlrui_or">oppure</string>
+    <string name="kdanlrui_email_input_hint">Indirizzo email</string>
+    <string name="kdanlrui_pwd_input_hint">Password</string>
+    <string name="kdanlrui_register_title">Partecipa a Kdan free</string>
+    <string name="kdanlrui_signIn_facebook">Accedi con Facebook</string>
+    <string name="kdanlrui_signIn_google">Accedi con Google</string>
+    <string name="kdanlrui_signIn_email">Accedi con la tua email</string>
+    <string name="kdanlrui_signUp_facebook">Continua con Facebook</string>
+    <string name="kdanlrui_signUp_google">Continua con Google</string>
+    <string name="kdanlrui_signUp_email">Continua con la tua email</string>
+    <string name="kdanlrui_switch_to_login">Ho già un account Kdan</string>
+    <string name="kdanlrui_switch_to_register">Crea un nuovo account</string>
+    <string name="kdanlrui_terms_of_service">Termini di servizio</string>
+    <string name="kdanlrui_privacy_policy">Politica sulla riservatezza</string>
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">Nome</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(minimo 8 caratteri)</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">Nome non valido</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">Email non valida</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">Password non valida</string>
+    <string name="kdanlrui_email_login_remember_me_check_box">Ricordami</string>
+    <string name="kdanlrui_email_login_pwd_help">Password Aiuto</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">Sottometti</string>
+    <string name="kdanlrui_bind_account_create_new_text">Inserisci il tuo indirizzo email qui sotto per continuare.</string>
+    <string name="kdanlrui_bind_account_create_new_btn">Sottometti</string>
+    <string name="kdanlrui_bind_account_bind_text">Hai già un account? Link al mio account di %1$s</string>
+    <string name="kdanlrui_bind_account_bind_btn">Connetti</string>
+    <string name="kdanlrui_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>
 </resources>

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

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="or">または</string>
-    <string name="email_input_hint">メールアドレス</string>
-    <string name="pwd_input_hint">パスワード</string>
-    <string name="register_title">Kdanに無料で参加</string>
-    <string name="signIn_facebook">Facebookからサインイン</string>
-    <string name="signIn_google">Googleからサインイン</string>
-    <string name="signIn_email">メールアドレスでログイン</string>
-    <string name="signUp_facebook">Facebookで続行</string>
-    <string name="signUp_google">Googleで続行</string>
-    <string name="signUp_email">メールアドレスで続行</string>
-    <string name="switch_to_login">"私は既にKdan IDを持っています。 "</string>
-    <string name="switch_to_register">アカウントを作成</string>
-    <string name="terms_of_service">サービス利用規約</string>
-    <string name="privacy_policy">プライバシーポリシー</string>
-    <string name="register_tos_and_pp_pattern">サインアップすることにより、あなたは当社の%1$sに同意し、当社の%2$sをお読みになったと見なされます。</string>
-    <string name="email_login_register_dialog_name_edit_text_hint">名前</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(最低8文字)</string>
-    <string name="email_login_register_dialog_name_error">無効な名前</string>
-    <string name="email_login_register_dialog_email_error">無効なアドレス</string>
-    <string name="email_login_register_dialog_pwd_error">無効なパスワード</string>
-    <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">続行するためにあなたの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>
+    <string name="kdanlrui_or">または</string>
+    <string name="kdanlrui_email_input_hint">メールアドレス</string>
+    <string name="kdanlrui_pwd_input_hint">パスワード</string>
+    <string name="kdanlrui_register_title">Kdanに無料で参加</string>
+    <string name="kdanlrui_signIn_facebook">Facebookからサインイン</string>
+    <string name="kdanlrui_signIn_google">Googleからサインイン</string>
+    <string name="kdanlrui_signIn_email">メールアドレスでログイン</string>
+    <string name="kdanlrui_signUp_facebook">Facebookで続行</string>
+    <string name="kdanlrui_signUp_google">Googleで続行</string>
+    <string name="kdanlrui_signUp_email">メールアドレスで続行</string>
+    <string name="kdanlrui_switch_to_login">"私は既にKdan IDを持っています。 "</string>
+    <string name="kdanlrui_switch_to_register">アカウントを作成</string>
+    <string name="kdanlrui_terms_of_service">サービス利用規約</string>
+    <string name="kdanlrui_privacy_policy">プライバシーポリシー</string>
+    <string name="kdanlrui_register_tos_and_pp_pattern">サインアップすることにより、あなたは当社の%1$sに同意し、当社の%2$sをお読みになったと見なされます。</string>
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">名前</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(最低8文字)</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">無効な名前</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">無効なアドレス</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">無効なパスワード</string>
+    <string name="kdanlrui_email_login_remember_me_check_box">保持する</string>
+    <string name="kdanlrui_email_login_pwd_help">パスワードヘルプ</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">送信</string>
+    <string name="kdanlrui_bind_account_create_new_text">続行するためにあなたのEメールアドレスを下に入力してください。</string>
+    <string name="kdanlrui_bind_account_create_new_btn">送信</string>
+    <string name="kdanlrui_bind_account_bind_text">既にアカウントをお持ちですか?%1$sアカウントにリンクします。</string>
+    <string name="kdanlrui_bind_account_bind_btn">接続</string>
+    <string name="kdanlrui_bind_account_bind_explanation">Kdan Cloudはお客様の%1$sのアカウントより表示名とメールアドレスだけを受け取るため、その他の個人情報を利用したり、ご本人の代わりにメッセージを投稿したりすることがございません。</string>
 </resources>

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

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="or">또는</string>
-    <string name="email_input_hint">이메일 주소</string>
-    <string name="pwd_input_hint">비밀번호</string>
-    <string name="register_title">케이단에 무료로 가입하세요</string>
-    <string name="signIn_facebook">Facebook 로그인</string>
-    <string name="signIn_google">Google로 로그인</string>
-    <string name="signIn_email">이메일로 로그인</string>
-    <string name="signUp_facebook">Facebook으로 계속하기</string>
-    <string name="signUp_google">Google로 계속하기</string>
-    <string name="signUp_email">이메일로 계속하기</string>
-    <string name="switch_to_login">나는 이미Kdan계좌가 있습니다</string>
-    <string name="switch_to_register">새 계좌 만들기</string>
-    <string name="terms_of_service">서비스 약관</string>
-    <string name="privacy_policy">개인정보취급방침</string>
-    <string name="email_login_register_dialog_name_edit_text_hint">이름</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(최소8자)</string>
-    <string name="email_login_register_dialog_name_error">유효하지 않은 이름</string>
-    <string name="email_login_register_dialog_email_error">유효하지 않은 이메일</string>
-    <string name="email_login_register_dialog_pwd_error">유효하지 않은 비밀번호</string>
-    <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">계속하려면 아래에 이메일 주소를 입력하십시오.</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>
+    <string name="kdanlrui_or">또는</string>
+    <string name="kdanlrui_email_input_hint">이메일 주소</string>
+    <string name="kdanlrui_pwd_input_hint">비밀번호</string>
+    <string name="kdanlrui_register_title">케이단에 무료로 가입하세요</string>
+    <string name="kdanlrui_signIn_facebook">Facebook 로그인</string>
+    <string name="kdanlrui_signIn_google">Google로 로그인</string>
+    <string name="kdanlrui_signIn_email">이메일로 로그인</string>
+    <string name="kdanlrui_signUp_facebook">Facebook으로 계속하기</string>
+    <string name="kdanlrui_signUp_google">Google로 계속하기</string>
+    <string name="kdanlrui_signUp_email">이메일로 계속하기</string>
+    <string name="kdanlrui_switch_to_login">나는 이미Kdan계좌가 있습니다</string>
+    <string name="kdanlrui_switch_to_register">새 계좌 만들기</string>
+    <string name="kdanlrui_terms_of_service">서비스 약관</string>
+    <string name="kdanlrui_privacy_policy">개인정보취급방침</string>
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">이름</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(최소8자)</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">유효하지 않은 이름</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">유효하지 않은 이메일</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">유효하지 않은 비밀번호</string>
+    <string name="kdanlrui_email_login_remember_me_check_box">저를 기억해 주세요</string>
+    <string name="kdanlrui_email_login_pwd_help">비밀번호 찾기</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">제출</string>
+    <string name="kdanlrui_bind_account_create_new_text">계속하려면 아래에 이메일 주소를 입력하십시오.</string>
+    <string name="kdanlrui_bind_account_create_new_btn">제출</string>
+    <string name="kdanlrui_bind_account_bind_text">이미 계정이 있으신가요? %1$s 계정으로 연결</string>
+    <string name="kdanlrui_bind_account_bind_btn">연결하기</string>
+    <string name="kdanlrui_bind_account_bind_explanation">Kdan Cloud 는 %1$s계정에서 표기 이름과 이메일 주소만을 받고 있습니다. 저희는 사용자를 대신해서 다른 개인정보나 게시물을 이용하지 않습니다.</string>
 </resources>

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

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="or">ou</string>
-    <string name="email_input_hint">Endereço de e-mail</string>
-    <string name="pwd_input_hint">Senha</string>
-    <string name="register_title">Inscrever-se gratuitamente na Kdan</string>
-    <string name="signIn_facebook">Iniciar Sessão com o Facebook</string>
-    <string name="signIn_google">Iniciar Sessão com o Google</string>
-    <string name="signIn_email">Entrar com e-mail</string>
-    <string name="signUp_facebook">Continuar com o Facebook</string>
-    <string name="signUp_google">Continuar com o Google</string>
-    <string name="signUp_email">Continuar com e-mail</string>
-    <string name="switch_to_login">Eu já tenho uma conta Kdan</string>
-    <string name="switch_to_register">Criar uma nova conta</string>
-    <string name="terms_of_service">Termos de serviço</string>
-    <string name="privacy_policy">Política de Privacidade</string>
-    <string name="register_tos_and_pp_pattern">Ao inscrever-se, você concorda com os nossos %1$s e que leu nossa %2$s.</string>
-    <string name="email_login_register_dialog_name_edit_text_hint">Nome</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(Mínimo de 8 caracteres)</string>
-    <string name="email_login_register_dialog_name_error">Nom invalide</string>
-    <string name="email_login_register_dialog_email_error">E-mail inválido</string>
-    <string name="email_login_register_dialog_pwd_error">Senha inválida</string>
-    <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">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>
+    <string name="kdanlrui_or">ou</string>
+    <string name="kdanlrui_email_input_hint">Endereço de e-mail</string>
+    <string name="kdanlrui_pwd_input_hint">Senha</string>
+    <string name="kdanlrui_register_title">Inscrever-se gratuitamente na Kdan</string>
+    <string name="kdanlrui_signIn_facebook">Iniciar Sessão com o Facebook</string>
+    <string name="kdanlrui_signIn_google">Iniciar Sessão com o Google</string>
+    <string name="kdanlrui_signIn_email">Entrar com e-mail</string>
+    <string name="kdanlrui_signUp_facebook">Continuar com o Facebook</string>
+    <string name="kdanlrui_signUp_google">Continuar com o Google</string>
+    <string name="kdanlrui_signUp_email">Continuar com e-mail</string>
+    <string name="kdanlrui_switch_to_login">Eu já tenho uma conta Kdan</string>
+    <string name="kdanlrui_switch_to_register">Criar uma nova conta</string>
+    <string name="kdanlrui_terms_of_service">Termos de serviço</string>
+    <string name="kdanlrui_privacy_policy">Política de Privacidade</string>
+    <string name="kdanlrui_register_tos_and_pp_pattern">Ao inscrever-se, você concorda com os nossos %1$s e que leu nossa %2$s.</string>
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">Nome</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(Mínimo de 8 caracteres)</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">Nom invalide</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">E-mail inválido</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">Senha inválida</string>
+    <string name="kdanlrui_email_login_remember_me_check_box">Lembrar de mim</string>
+    <string name="kdanlrui_email_login_pwd_help">Ajuda com a Senha</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">Submeter</string>
+    <string name="kdanlrui_bind_account_create_new_text">Favor digitar seu endereço de e-mail abaixo para continuar.</string>
+    <string name="kdanlrui_bind_account_create_new_btn">Submeter</string>
+    <string name="kdanlrui_bind_account_bind_text">Você já tem uma conta? Link para minha conta do %1$s</string>
+    <string name="kdanlrui_bind_account_bind_btn">Conectar</string>
+    <string name="kdanlrui_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>
 </resources>

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

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="or">или</string>
-    <string name="email_input_hint">Адрес электронной почты</string>
-    <string name="pwd_input_hint">Пароль</string>
-    <string name="register_title">Присоединяйтесь к Kdan бесплатно</string>
-    <string name="signIn_facebook">Вход с Facebook</string>
-    <string name="signIn_google">Вход с Google</string>
-    <string name="signIn_email">Вход, используя эл. почту</string>
-    <string name="signUp_facebook">Войти через Facebook</string>
-    <string name="signUp_google">Войти через Google</string>
-    <string name="signUp_email">Войти, используя эл. почту</string>
-    <string name="switch_to_register">Создать новый профиль</string>
-    <string name="switch_to_login">У меня уже есть Kdan профиль</string>
-    <string name="terms_of_service">Условия Соглашения</string>
-    <string name="privacy_policy">Политика конфиденциальности</string>
-    <string name="email_login_register_dialog_name_edit_text_hint">Имя</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(Минимум из 8 символов)</string>
-    <string name="email_login_register_dialog_name_error">Неверное имя</string>
-    <string name="email_login_register_dialog_email_error">Неверное имя пользователя</string>
-    <string name="email_login_register_dialog_pwd_error">Неверный пароль</string>
-    <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">Пожалуйста, ниже введите свой адрес электронной почты для продолжения.</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>
+    <string name="kdanlrui_or">или</string>
+    <string name="kdanlrui_email_input_hint">Адрес электронной почты</string>
+    <string name="kdanlrui_pwd_input_hint">Пароль</string>
+    <string name="kdanlrui_register_title">Присоединяйтесь к Kdan бесплатно</string>
+    <string name="kdanlrui_signIn_facebook">Вход с Facebook</string>
+    <string name="kdanlrui_signIn_google">Вход с Google</string>
+    <string name="kdanlrui_signIn_email">Вход, используя эл. почту</string>
+    <string name="kdanlrui_signUp_facebook">Войти через Facebook</string>
+    <string name="kdanlrui_signUp_google">Войти через Google</string>
+    <string name="kdanlrui_signUp_email">Войти, используя эл. почту</string>
+    <string name="kdanlrui_switch_to_register">Создать новый профиль</string>
+    <string name="kdanlrui_switch_to_login">У меня уже есть Kdan профиль</string>
+    <string name="kdanlrui_terms_of_service">Условия Соглашения</string>
+    <string name="kdanlrui_privacy_policy">Политика конфиденциальности</string>
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">Имя</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(Минимум из 8 символов)</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">Неверное имя</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">Неверное имя пользователя</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">Неверный пароль</string>
+    <string name="kdanlrui_email_login_remember_me_check_box">Запомнить меня</string>
+    <string name="kdanlrui_email_login_pwd_help">Напомнить Пароль</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">ОК</string>
+    <string name="kdanlrui_bind_account_create_new_text">Пожалуйста, ниже введите свой адрес электронной почты для продолжения.</string>
+    <string name="kdanlrui_bind_account_create_new_btn">ОК</string>
+    <string name="kdanlrui_bind_account_bind_text">Уже есть аккаунт? Ссылка на мой аккаунт %1$s.</string>
+    <string name="kdanlrui_bind_account_bind_btn">Подсоединиться</string>
+    <string name="kdanlrui_bind_account_bind_explanation">Kdan Cloud будет иметь доступ только к вашему отображаемому имени и электронной почте из вашего аккаунта %1$s. Мы не будем использовать другие персональные данные или отправлять посты от вашего имени.</string>
 </resources>

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

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="or">或</string>
-    <string name="email_input_hint">Email信箱</string>
-    <string name="pwd_input_hint">密碼</string>
-    <string name="register_title">免費加入凱鈿會員</string>
-    <string name="signIn_facebook">Facebook帳號登入</string>
-    <string name="signIn_google">Google帳號登入</string>
-    <string name="signIn_email">用Email信箱登入</string>
-    <string name="signUp_facebook">Facebook帳號註冊</string>
-    <string name="signUp_google">Google帳號註冊</string>
-    <string name="signUp_email">用Email信箱註冊</string>
-    <string name="switch_to_register">建立新帳號</string>
-    <string name="switch_to_login">已有Kdan帳號</string>
-    <string name="terms_of_service">服務條款</string>
-    <string name="privacy_policy">隱私權政策</string>
-    <string name="register_tos_and_pp_pattern">當您確認註冊同時,即代表您已詳細閱讀且同意我们的%1$s和%2$s。</string>
-    <string name="email_login_register_dialog_name_edit_text_hint">用戶名稱</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(至少8個字元)</string>
-    <string name="email_login_register_dialog_name_error">用戶名無效</string>
-    <string name="email_login_register_dialog_email_error">Email格式有誤</string>
-    <string name="email_login_register_dialog_pwd_error">密碼錯誤</string>
-    <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">請於下方輸入您的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>
+    <string name="kdanlrui_or">或</string>
+    <string name="kdanlrui_email_input_hint">Email信箱</string>
+    <string name="kdanlrui_pwd_input_hint">密碼</string>
+    <string name="kdanlrui_register_title">免費加入凱鈿會員</string>
+    <string name="kdanlrui_signIn_facebook">Facebook帳號登入</string>
+    <string name="kdanlrui_signIn_google">Google帳號登入</string>
+    <string name="kdanlrui_signIn_email">用Email信箱登入</string>
+    <string name="kdanlrui_signUp_facebook">Facebook帳號註冊</string>
+    <string name="kdanlrui_signUp_google">Google帳號註冊</string>
+    <string name="kdanlrui_signUp_email">用Email信箱註冊</string>
+    <string name="kdanlrui_switch_to_register">建立新帳號</string>
+    <string name="kdanlrui_switch_to_login">已有Kdan帳號</string>
+    <string name="kdanlrui_terms_of_service">服務條款</string>
+    <string name="kdanlrui_privacy_policy">隱私權政策</string>
+    <string name="kdanlrui_register_tos_and_pp_pattern">當您確認註冊同時,即代表您已詳細閱讀且同意我们的%1$s和%2$s。</string>
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">用戶名稱</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(至少8個字元)</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">用戶名無效</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">Email格式有誤</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">密碼錯誤</string>
+    <string name="kdanlrui_email_login_remember_me_check_box">記住我</string>
+    <string name="kdanlrui_email_login_pwd_help">忘記密碼</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">送出</string>
+    <string name="kdanlrui_bind_account_create_new_text">請於下方輸入您的Email信箱繼續</string>
+    <string name="kdanlrui_bind_account_create_new_btn">送出</string>
+    <string name="kdanlrui_bind_account_bind_text">已是註冊會員? 連結我的%1$s帳號</string>
+    <string name="kdanlrui_bind_account_bind_btn">連結</string>
+    <string name="kdanlrui_bind_account_bind_explanation">Kdan Cloud只透過%1$s來取得您的Email和姓名,將不會使用其他私人資訊或張貼文章.</string>
 </resources>

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

@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="or">或</string>
-    <string name="email_input_hint">Email邮箱</string>
-    <string name="pwd_input_hint">密码</string>
-    <string name="register_title">免费加入凯钿会员</string>
-    <string name="signIn_facebook">用Facebook账号登录</string>
-    <string name="signIn_google">用Google账号登录</string>
-    <string name="signIn_email">用电子邮件登入</string>
-    <string name="signUp_facebook">用Facebook账号注册</string>
-    <string name="signUp_google">用谷歌账号注册</string>
-    <string name="signUp_email">用电子邮件注册</string>
-    <string name="switch_to_register">创建新账号</string>
-    <string name="switch_to_login">已有Kdan账号</string>
-    <string name="terms_of_service">服务条款</string>
-    <string name="privacy_policy">隐私政策</string>
-    <string name="register_tos_and_pp_pattern">当您提交注册时,代表您已经同意我们的%1$s和已经阅读了我们的%2$s</string>
-    <string name="email_login_register_dialog_name_edit_text_hint">用户名</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(最少需要8个字符)</string>
-    <string name="email_login_register_dialog_name_error">用户名无效</string>
-    <string name="email_login_register_dialog_email_error">Email格式有误</string>
-    <string name="email_login_register_dialog_pwd_error">密码错误</string>
-    <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">请于下方输入您的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>
+    <string name="kdanlrui_or">或</string>
+    <string name="kdanlrui_email_input_hint">Email邮箱</string>
+    <string name="kdanlrui_pwd_input_hint">密码</string>
+    <string name="kdanlrui_register_title">免费加入凯钿会员</string>
+    <string name="kdanlrui_signIn_facebook">用Facebook账号登录</string>
+    <string name="kdanlrui_signIn_google">用Google账号登录</string>
+    <string name="kdanlrui_signIn_email">用电子邮件登入</string>
+    <string name="kdanlrui_signUp_facebook">用Facebook账号注册</string>
+    <string name="kdanlrui_signUp_google">用谷歌账号注册</string>
+    <string name="kdanlrui_signUp_email">用电子邮件注册</string>
+    <string name="kdanlrui_switch_to_register">创建新账号</string>
+    <string name="kdanlrui_switch_to_login">已有Kdan账号</string>
+    <string name="kdanlrui_terms_of_service">服务条款</string>
+    <string name="kdanlrui_privacy_policy">隐私政策</string>
+    <string name="kdanlrui_register_tos_and_pp_pattern">当您提交注册时,代表您已经同意我们的%1$s和已经阅读了我们的%2$s</string>
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">用户名</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(最少需要8个字符)</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">用户名无效</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">Email格式有误</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">密码错误</string>
+    <string name="kdanlrui_email_login_remember_me_check_box">记住密码</string>
+    <string name="kdanlrui_email_login_pwd_help">忘记密码</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">提交</string>
+    <string name="kdanlrui_bind_account_create_new_text">请于下方输入您的Email以便进行下一步操作</string>
+    <string name="kdanlrui_bind_account_create_new_btn">提交</string>
+    <string name="kdanlrui_bind_account_bind_text">已经是注册会员?绑定%1$s账号。</string>
+    <string name="kdanlrui_bind_account_bind_btn">绑定</string>
+    <string name="kdanlrui_bind_account_bind_explanation">凯钿软件通过%1$s获取您的用户名和邮箱,我们不会以此泄露您的个人信息也不会以用户名义发布任何信息</string>
 </resources>

+ 15 - 15
src/main/res/values/colors.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="kdan_blue">#007aff</color>
-    <color name="kdan_green">#96d200</color>
-    <color name="form_primary_blue">#31b1fd</color>
-    <color name="or_diver">#dbdbdb</color>
+    <color name="kdanlrui_kdan_blue">#007aff</color>
+    <color name="kdanlrui_kdan_green">#96d200</color>
+    <color name="kdanlrui_form_primary_blue">#31b1fd</color>
+    <color name="kdanlrui_or_diver">#dbdbdb</color>
 
-    <color name="colorAccent">@color/kdan_blue</color>
+    <color name="kdanlrui_colorAccent">@color/kdanlrui_kdan_blue</color>
 
-    <color name="third_party_btn_text">#ffffff</color>
-    <color name="facebook_blue">#3b5998</color>
-    <color name="google_blue">#4285f4</color>
-    <color name="switch_text">#0169d4</color>
-    <color name="tos_pp_text">#0854ff</color>
+    <color name="kdanlrui_third_party_btn_text">#ffffff</color>
+    <color name="kdanlrui_facebook_blue">#3b5998</color>
+    <color name="kdanlrui_google_blue">#4285f4</color>
+    <color name="kdanlrui_switch_text">#0169d4</color>
+    <color name="kdanlrui_tos_pp_text">#0854ff</color>
 
-    <color name="email_login_register_form_primary_blue">@color/form_primary_blue</color>
-    <color name="email_login_register_form_bg">#e3e3e3</color>
-    <color name="email_login_register_form_input_border">#e3e3e3</color>
+    <color name="kdanlrui_email_login_register_form_primary_blue">@color/kdanlrui_form_primary_blue</color>
+    <color name="kdanlrui_email_login_register_form_bg">#e3e3e3</color>
+    <color name="kdanlrui_email_login_register_form_input_border">#e3e3e3</color>
 
-    <color name="email_login_pwd_helper">#0169d4</color>
+    <color name="kdanlrui_email_login_pwd_helper">#0169d4</color>
 
-    <color name="register_title">@color/kdan_green</color>
+    <color name="kdanlrui_register_title">@color/kdanlrui_kdan_green</color>
 </resources>

+ 10 - 10
src/main/res/values/dimens.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="or_divider_text_size">14sp</dimen>
+    <dimen name="kdanlrui_or_divider_text_size">14sp</dimen>
 
-    <dimen name="login_register_text_size">14sp</dimen>
-    <dimen name="login_register_btn_width">272dp</dimen>
-    <dimen name="login_register_btn_height">40dp</dimen>
+    <dimen name="kdanlrui_login_register_text_size">14sp</dimen>
+    <dimen name="kdanlrui_login_register_btn_width">272dp</dimen>
+    <dimen name="kdanlrui_login_register_btn_height">40dp</dimen>
 
-    <dimen name="tos_and_pp_text_size">12sp</dimen>
+    <dimen name="kdanlrui_tos_and_pp_text_size">12sp</dimen>
 
-    <dimen name="email_login_dialog_field_height">44dp</dimen>
-    <dimen name="email_login_dialog_field_text">14sp</dimen>
-    <dimen name="email_login_dialog_field_text_padding_left_right">12dp</dimen>
-    <dimen name="email_login_dialog_field_text_padding_top_bottom">54dp</dimen>
-    <dimen name="email_login_dialog_width">296dp</dimen>
+    <dimen name="kdanlrui_email_login_dialog_field_height">44dp</dimen>
+    <dimen name="kdanlrui_email_login_dialog_field_text">14sp</dimen>
+    <dimen name="kdanlrui_email_login_dialog_field_text_padding_left_right">12dp</dimen>
+    <dimen name="kdanlrui_email_login_dialog_field_text_padding_top_bottom">54dp</dimen>
+    <dimen name="kdanlrui_email_login_dialog_width">296dp</dimen>
 </resources>

+ 39 - 39
src/main/res/values/strings.xml

@@ -1,43 +1,43 @@
 <resources>
     <string name="app_name" translatable="false">KdanLoginRegisterUI</string>
 
-    <string name="emptyImageContextDescription" translatable="false"></string>
-    <string name="or">or</string>
-
-    <string name="email_input_hint">Email Address</string>
-    <string name="pwd_input_hint">Password</string>
-
-    <string name="register_title">Join Kdan for Free</string>
-
-    <string name="signIn_facebook">Sign in with Facebook</string>
-    <string name="signIn_google">Sign in with Google</string>
-    <string name="signIn_email">Sign in with Email</string>
-    <string name="signUp_facebook">Sign up with Facebook</string>
-    <string name="signUp_google">Sign up with Google</string>
-    <string name="signUp_email">Sign up with Email</string>
-
-    <string name="switch_to_register">Create a new account</string>
-    <string name="switch_to_login">I already have a Kdan account</string>
-
-    <string name="terms_of_service">Terms of Service</string>
-    <string name="privacy_policy">Privacy Policy</string>
-    <string name="register_tos_and_pp_pattern">"By signing up, you agree to our %1$s and that you have read our %2$s"</string>
-
-    <string name="email_login_register_dialog_name_edit_text_hint">Name</string>
-    <string name="email_login_register_dialog_email_edit_text_hint" translatable="false">@string/email_input_hint</string>
-    <string name="email_login_register_dialog_password_edit_text_hint" translatable="false">@string/pwd_input_hint</string>
-    <string name="email_login_register_dialog_password_edit_text_hint_minimum">(Minimum of 8 characters) </string>
-    <string name="email_login_remember_me_check_box">Remember Me</string>
-    <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">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>
-    <string name="bind_account_bind_explanation">Kdan Cloud will only receive your display name and email address from your %1$s account. We will not use other private information or post on your behalf.</string>
-    <string name="email_login_register_dialog_name_error">Invalid name</string>
-    <string name="email_login_register_dialog_email_error">Invalid email</string>
-    <string name="email_login_register_dialog_pwd_error">Invalid password</string>
+    <string name="kdanlrui_emptyImageContextDescription" translatable="false"></string>
+    <string name="kdanlrui_or">or</string>
+
+    <string name="kdanlrui_email_input_hint">Email Address</string>
+    <string name="kdanlrui_pwd_input_hint">Password</string>
+
+    <string name="kdanlrui_register_title">Join Kdan for Free</string>
+
+    <string name="kdanlrui_signIn_facebook">Sign in with Facebook</string>
+    <string name="kdanlrui_signIn_google">Sign in with Google</string>
+    <string name="kdanlrui_signIn_email">Sign in with Email</string>
+    <string name="kdanlrui_signUp_facebook">Sign up with Facebook</string>
+    <string name="kdanlrui_signUp_google">Sign up with Google</string>
+    <string name="kdanlrui_signUp_email">Sign up with Email</string>
+
+    <string name="kdanlrui_switch_to_register">Create a new account</string>
+    <string name="kdanlrui_switch_to_login">I already have a Kdan account</string>
+
+    <string name="kdanlrui_terms_of_service">Terms of Service</string>
+    <string name="kdanlrui_privacy_policy">Privacy Policy</string>
+    <string name="kdanlrui_register_tos_and_pp_pattern">"By signing up, you agree to our %1$s and that you have read our %2$s"</string>
+
+    <string name="kdanlrui_email_login_register_dialog_name_edit_text_hint">Name</string>
+    <string name="kdanlrui_email_login_register_dialog_email_edit_text_hint" translatable="false">@string/kdanlrui_email_input_hint</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint" translatable="false">@string/kdanlrui_pwd_input_hint</string>
+    <string name="kdanlrui_email_login_register_dialog_password_edit_text_hint_minimum">(Minimum of 8 characters) </string>
+    <string name="kdanlrui_email_login_remember_me_check_box">Remember Me</string>
+    <string name="kdanlrui_email_login_pwd_help">Password Help</string>
+    <string name="kdanlrui_email_register_dialog_submit_btn">Submit</string>
+
+    <string name="kdanlrui_bind_account_create_new_text">Please enter your email address below to continue.</string>
+    <string name="kdanlrui_bind_account_create_new_btn">Submit</string>
+    <string name="kdanlrui_bind_account_bind_text">Already have an existing Kdan account? Connect to %1$s</string>
+    <string name="kdanlrui_bind_account_bind_email_input_hint" translatable="false">@string/kdanlrui_email_input_hint</string>
+    <string name="kdanlrui_bind_account_bind_btn">Connect</string>
+    <string name="kdanlrui_bind_account_bind_explanation">Kdan Cloud will only receive your display name and email address from your %1$s account. We will not use other private information or post on your behalf.</string>
+    <string name="kdanlrui_email_login_register_dialog_name_error">Invalid name</string>
+    <string name="kdanlrui_email_login_register_dialog_email_error">Invalid email</string>
+    <string name="kdanlrui_email_login_register_dialog_pwd_error">Invalid password</string>
 </resources>