From 2ad137ed83c3bd1df1bc079be60f1fbbc9d32458 Mon Sep 17 00:00:00 2001
From: littleWhiteDuck <965265562@qq.com>
Date: Sat, 4 Mar 2023 15:29:07 +0800
Subject: [PATCH] fix to clip tip
---
app/src/main/java/me/duck/hooktest/MainActivity.java | 10 +++++-----
app/src/main/res/values-zh-rCN/strings.xml | 1 +
app/src/main/res/values/strings.xml | 1 +
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/app/src/main/java/me/duck/hooktest/MainActivity.java b/app/src/main/java/me/duck/hooktest/MainActivity.java
index 1993aec..579f1db 100644
--- a/app/src/main/java/me/duck/hooktest/MainActivity.java
+++ b/app/src/main/java/me/duck/hooktest/MainActivity.java
@@ -202,7 +202,7 @@ private void readAssetsText() {
} catch (IOException e) {
result = "error";
}
- showMessageDialog("读取Assets文件", result);
+ showMessageDialog(getString(R.string.main_read_assets_file), result);
}
private void showPutClipDialog() {
@@ -212,7 +212,7 @@ private void showPutClipDialog() {
.setPositiveButton(R.string.main_dialog_confirm, (dialog, which) -> {
EditText editText = ((AlertDialog) dialog).findViewById(R.id.text_input_edit);
//noinspection ConstantConditions
- toClip(editText.getText().toString().trim());
+ toClip(editText.getText().toString().trim(), "Copied!!!");
})
.setNegativeButton(getString(R.string.main_dialog_cancel), null)
.show();
@@ -339,10 +339,10 @@ private String getReturnValue() {
}
@SuppressLint("WrongConstant")
- private void toClip(String text) {
+ private void toClip(String text, String tip) {
ClipboardManager clipboardManager = (ClipboardManager) getSystemService(Context.CLIPBOARD_SERVICE);
clipboardManager.setPrimaryClip(ClipData.newPlainText("label", text));
- Toast.makeText(this, R.string.main_copy_config_tip, Toast.LENGTH_SHORT).show();
+ Toast.makeText(this, tip, Toast.LENGTH_SHORT).show();
}
@@ -356,7 +356,7 @@ public boolean onCreateOptionsMenu(@NonNull Menu menu) {
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
int id = item.getItemId();
if (id == R.id.menu_copy) {
- toClip(config);
+ toClip(config, getString(R.string.main_copy_config_tip));
}
return true;
}
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 72532f2..92cb842 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -41,4 +41,5 @@
输入文字
退出应用
测试闪退
+ 读取Assets文件
\ 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 ecb2755..4826da5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -42,6 +42,7 @@
input text
Exit app
Test Crash
+ Read Assets file
- Finish()
- System.exit()