diff --git a/samples/app/src/main/java/com/highcapable/hikage/demo/ui/MainActivity.kt b/samples/app/src/main/java/com/highcapable/hikage/demo/ui/MainActivity.kt
index f86267a..3941450 100644
--- a/samples/app/src/main/java/com/highcapable/hikage/demo/ui/MainActivity.kt
+++ b/samples/app/src/main/java/com/highcapable/hikage/demo/ui/MainActivity.kt
@@ -27,10 +27,9 @@ import android.os.Bundle
 import android.text.InputType
 import android.widget.LinearLayout
 import androidx.core.view.setPadding
+import androidx.core.widget.doOnTextChanged
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import com.highcapable.betterandroid.ui.extension.view.textToString
 import com.highcapable.betterandroid.ui.extension.view.toast
 import com.highcapable.hikage.demo.R
 import com.highcapable.hikage.demo.ui.base.BaseActivity
@@ -54,8 +53,8 @@ class MainActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView {
-            lateinit var usernameInput: TextInputEditText
-            lateinit var passwordInput: TextInputEditText
+            var username = ""
+            var password = ""
             CoordinatorLayout(
                 lparams = LayoutParams(matchParent = true)
             ) {
@@ -80,10 +79,13 @@ class MainActivity : BaseActivity() {
                             hint = stringResource(R.string.text_username)
                         }
                     ) {
-                        usernameInput = TextInputEditText(
+                        TextInputEditText(
                             lparams = LayoutParams(widthMatchParent = true)
                         ) {
                             isSingleLine = true
+                            doOnTextChanged { text, _, _, _ -> 
+                                username = text.toString()
+                            }
                         }
                     }
                     TextInputLayout(
@@ -95,11 +97,14 @@ class MainActivity : BaseActivity() {
                             endIconMode = TextInputLayout.END_ICON_PASSWORD_TOGGLE
                         }
                     ) {
-                        passwordInput = TextInputEditText(
+                        TextInputEditText(
                             lparams = LayoutParams(widthMatchParent = true)
                         ) {
                             isSingleLine = true
                             inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_VARIATION_PASSWORD
+                            doOnTextChanged { text, _, _, _ -> 
+                                password = text.toString()
+                            }
                         }
                     }
                     ChipGroup(
@@ -159,8 +164,6 @@ class MainActivity : BaseActivity() {
                     ) {
                         text = stringResource(R.string.text_submit)
                         setOnClickListener {
-                            val username = usernameInput.textToString()
-                            val password = passwordInput.textToString()
                             if (username.isNotEmpty() && password.isNotEmpty())
                                 MaterialAlertDialogBuilder(this@MainActivity)
                                     .setTitle(stringResource(R.string.login_info))
diff --git a/samples/app/src/main/res/values-zh-rCN/strings.xml b/samples/app/src/main/res/values-zh-rCN/strings.xml
index 109c340..3fcc5c4 100644
--- a/samples/app/src/main/res/values-zh-rCN/strings.xml
+++ b/samples/app/src/main/res/values-zh-rCN/strings.xml
@@ -9,7 +9,7 @@
     <string name="text_description">如你所见，所有布局都通过代码动态创建，你可以在任何地方对布局进行自定义。</string>
     <string name="text_submit">提交</string>
     <string name="login_info">登录信息</string>
-    <string name="login_info_description">用户名：%1$s\n密码：%1$s</string>
+    <string name="login_info_description">用户名：%1$s\n密码：%2$s</string>
     <string name="login_info_not_fill_tip">请填写所有内容</string>
     <string name="text_welcome">欢迎使用 Hikage！</string>
 </resources>
\ No newline at end of file
diff --git a/samples/app/src/main/res/values/strings.xml b/samples/app/src/main/res/values/strings.xml
index 34f79bd..1cc0c8c 100644
--- a/samples/app/src/main/res/values/strings.xml
+++ b/samples/app/src/main/res/values/strings.xml
@@ -8,7 +8,7 @@
     <string name="text_description">As you can see, all layouts are created dynamically through code, and you can customize the layout anywhere.</string>
     <string name="text_submit">Submit</string>
     <string name="login_info">Login Info</string>
-    <string name="login_info_description">Username: %1$s\nPassword: %1$s</string>
+    <string name="login_info_description">Username: %1$s\nPassword: %2$s</string>
     <string name="login_info_not_fill_tip">Please fill in all fields</string>
     <string name="text_welcome">Welcome to use Hikage!</string>
 </resources>
\ No newline at end of file