diff --git a/app/src/main/java/moe/tqlwsl/aicemu/MainActivity.kt b/app/src/main/java/moe/tqlwsl/aicemu/MainActivity.kt index 4df8aa6..af00de8 100644 --- a/app/src/main/java/moe/tqlwsl/aicemu/MainActivity.kt +++ b/app/src/main/java/moe/tqlwsl/aicemu/MainActivity.kt @@ -69,13 +69,13 @@ class MainActivity : AppCompatActivity() { if (nfcAdapter == null) { Log.e(TAG, "NFC not supported") AlertDialog.Builder(this) - .setTitle("Error").setMessage("NFC not supported").setCancelable(false).show() + .setTitle(R.string.error).setMessage("NFC not supported").setCancelable(false).show() return } if (!nfcAdapter!!.isEnabled) { Log.e(TAG, "NFC is off") AlertDialog.Builder(this) - .setTitle("Error").setMessage("NFC is off").setCancelable(false).show() + .setTitle(R.string.error).setMessage("NFC is off").setCancelable(false).show() return } @@ -165,7 +165,7 @@ class MainActivity : AppCompatActivity() { private fun showCardMenu(v: View, cardView: View) { val popupMenu = PopupMenu(this, v) - popupMenu.inflate(R.menu.card_menu) // 加载菜单资源文件 + popupMenu.inflate(R.menu.card_menu) popupMenu.setOnMenuItemClickListener { item: MenuItem -> when (item.itemId) { R.id.card_menu_rename -> { @@ -175,7 +175,7 @@ class MainActivity : AppCompatActivity() { editText.visibility = View.VISIBLE editText.setText(textView.text) editText.requestFocus() - editText.setOnFocusChangeListener { v, hasFocus -> + editText.setOnFocusChangeListener { _, hasFocus -> if (!hasFocus) { textView.text = editText.text textView.visibility = View.VISIBLE @@ -183,11 +183,6 @@ class MainActivity : AppCompatActivity() { saveCards() } } -// cardView.setOnTouchListener { v, _ -> -// editText.clearFocus() -// v.performClick() -// true -// } true } R.id.card_menu_delete -> { @@ -199,7 +194,7 @@ class MainActivity : AppCompatActivity() { else -> false } } - popupMenu.show() // 显示PopupMenu + popupMenu.show() } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index f7f5f8f..fff896a 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -39,7 +39,7 @@ android:layout_gravity="bottom|end" android:layout_margin="16dp" android:clickable="true" - android:contentDescription="@string/add_card" + android:contentDescription="@string/desc_add_card" android:focusable="true" app:backgroundTint="@color/colorSecondary" app:maxImageSize="35dp" diff --git a/app/src/main/res/layout/add_card.xml b/app/src/main/res/layout/add_card.xml index d4beada..aac975e 100644 --- a/app/src/main/res/layout/add_card.xml +++ b/app/src/main/res/layout/add_card.xml @@ -30,7 +30,7 @@ android:text="@string/read_card_tip" android:textColor="@color/design_default_color_on_primary" android:textSize="18sp" - android:contentDescription="@string/close_popup" /> + android:contentDescription="@string/desc_close_popup" /> diff --git a/app/src/main/res/layout/card.xml b/app/src/main/res/layout/card.xml index 4a6f1c7..cfc6216 100644 --- a/app/src/main/res/layout/card.xml +++ b/app/src/main/res/layout/card.xml @@ -19,7 +19,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="20dp" - android:text="@string/card_name" + android:text="@string/dummy_card_name" android:textColor="?android:attr/textColorPrimary" android:textSize="40sp" /> @@ -29,7 +29,7 @@ android:layout_height="wrap_content" android:layout_marginStart="20dp" android:layout_marginTop="20dp" - android:text="@string/card_name" + android:text="@string/dummy_card_name" android:textColor="?android:attr/textColorPrimary" android:textSize="40sp" android:visibility="gone" /> @@ -64,7 +64,7 @@ android:layout_marginEnd="10dp" android:layout_gravity="end|top" android:background="@null" - android:contentDescription="@string/edit_card" + android:contentDescription="@string/desc_edit_card" android:src="@android:drawable/ic_menu_edit" /> \ No newline at end of file diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml new file mode 100644 index 0000000..6aac06f --- /dev/null +++ b/app/src/main/res/values-zh/strings.xml @@ -0,0 +1,10 @@ + + 设置 + AIC Card + 请与AIC卡贴贴! + 改名 + 删除 + 展示卡号 + 隐藏卡号 + 出错了! + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 084e94a..590591d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,14 +1,16 @@ - AICEmu + AICEmu Rename Delete Show IDm + Hide IDm Settings - add card - edit card - close - 012EXXXXXXXXXXXX - AIC Card - 请与AIC卡贴贴! - EmuCard + Error! + AIC Card + 012EXXXXXXXXXXXX + Please touch your AIC Card! + add card + edit card + close + EmuCard \ No newline at end of file diff --git a/app/src/main/res/xml/host_nfcf_service.xml b/app/src/main/res/xml/host_nfcf_service.xml index 733a031..480e320 100644 --- a/app/src/main/res/xml/host_nfcf_service.xml +++ b/app/src/main/res/xml/host_nfcf_service.xml @@ -1,6 +1,6 @@ + android:description="@string/desc_service"> \ No newline at end of file