From a6aa1939437240214f00420f22ccf64f2334c758 Mon Sep 17 00:00:00 2001 From: Simon Date: Mon, 19 Aug 2024 13:51:13 +0800 Subject: [PATCH] version 1.0.5 release_add res --- .idea/misc.xml | 8 ++ .../alltrans/allservice/SusService.kt | 4 + .../assimilate/alltrans/curview/GlobalView.kt | 2 +- .../alltrans/model/PreferenceLanguageUtils.kt | 1 + .../alltrans/viewui/LanguageChangeActivity.kt | 8 +- .../alltrans/viewui/PhotoImageActivity.kt | 9 ++ .../drawable-xxxhdpi/ic_ph_recap_11111.webp | Bin 0 -> 764 bytes app/src/main/res/drawable/ic_dic_more.xml | 9 ++ app/src/main/res/drawable/ic_reshoot.xml | 12 +++ app/src/main/res/layout/activity_history.xml | 5 + app/src/main/res/layout/activity_main.xml | 4 +- app/src/main/res/menu/language_menu.xml | 9 ++ app/src/main/res/menu/popup_menu.xml | 8 ++ app/src/main/res/values-zh-rCN/strings.xml | 94 ++++++++++++++++++ 14 files changed, 169 insertions(+), 4 deletions(-) create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_ph_recap_11111.webp create mode 100644 app/src/main/res/drawable/ic_dic_more.xml create mode 100644 app/src/main/res/drawable/ic_reshoot.xml create mode 100644 app/src/main/res/menu/language_menu.xml create mode 100644 app/src/main/res/menu/popup_menu.xml create mode 100644 app/src/main/res/values-zh-rCN/strings.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 8978d23..1cb0719 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,3 +1,4 @@ + @@ -6,4 +7,11 @@ + + + \ No newline at end of file diff --git a/app/src/main/java/com/assimilate/alltrans/allservice/SusService.kt b/app/src/main/java/com/assimilate/alltrans/allservice/SusService.kt index 218980f..d8ac794 100644 --- a/app/src/main/java/com/assimilate/alltrans/allservice/SusService.kt +++ b/app/src/main/java/com/assimilate/alltrans/allservice/SusService.kt @@ -165,6 +165,10 @@ class SusService : Service() { if (::copyTextView.isInitialized) { copyTextView.removeView() } + if (::globalView.isInitialized) { + globalView.removeGlobalView() + } + } } diff --git a/app/src/main/java/com/assimilate/alltrans/curview/GlobalView.kt b/app/src/main/java/com/assimilate/alltrans/curview/GlobalView.kt index 972e308..8c98d3e 100644 --- a/app/src/main/java/com/assimilate/alltrans/curview/GlobalView.kt +++ b/app/src/main/java/com/assimilate/alltrans/curview/GlobalView.kt @@ -70,7 +70,7 @@ class GlobalView(private val context: Context) : TextRecognitionProcessor.TextRe } } - private fun removeGlobalView() { + fun removeGlobalView() { if (globalViewIsAdd) { windowManager.removeView(globalView) globalViewIsAdd = false diff --git a/app/src/main/java/com/assimilate/alltrans/model/PreferenceLanguageUtils.kt b/app/src/main/java/com/assimilate/alltrans/model/PreferenceLanguageUtils.kt index a87e2af..ab323d1 100644 --- a/app/src/main/java/com/assimilate/alltrans/model/PreferenceLanguageUtils.kt +++ b/app/src/main/java/com/assimilate/alltrans/model/PreferenceLanguageUtils.kt @@ -50,6 +50,7 @@ object PreferenceLanguageUtils { } } editor.apply() + } fun addRecentLanguage(language: Language) { diff --git a/app/src/main/java/com/assimilate/alltrans/viewui/LanguageChangeActivity.kt b/app/src/main/java/com/assimilate/alltrans/viewui/LanguageChangeActivity.kt index 2ccc659..c963c9d 100644 --- a/app/src/main/java/com/assimilate/alltrans/viewui/LanguageChangeActivity.kt +++ b/app/src/main/java/com/assimilate/alltrans/viewui/LanguageChangeActivity.kt @@ -63,7 +63,13 @@ class LanguageChangeActivity : AppCompatActivity() { } override fun onQueryTextChange(newText: String?): Boolean { - (binding.listLanguages.adapter as LanguageAdapter).filter.filter(newText) + // 确保 adapter 不为空并且是 LanguageAdapter 类型 + val adapter = binding.listLanguages.adapter + if (adapter is LanguageAdapter) { + adapter.filter.filter(newText) + } else { + Log.e("LanguageChangeActivity", "Adapter is either null or not of type LanguageAdapter.") + } return true } }) diff --git a/app/src/main/java/com/assimilate/alltrans/viewui/PhotoImageActivity.kt b/app/src/main/java/com/assimilate/alltrans/viewui/PhotoImageActivity.kt index 698cc62..8ad3837 100644 --- a/app/src/main/java/com/assimilate/alltrans/viewui/PhotoImageActivity.kt +++ b/app/src/main/java/com/assimilate/alltrans/viewui/PhotoImageActivity.kt @@ -317,6 +317,11 @@ class PhotoImageActivity : AppCompatActivity(), TextRecognitionProcessor.TextRec } private fun toggleFlash() { + if (!::imageCapture.isInitialized) { + Log.e(TAG, "ImageCapture is not initialized") + return + } + imageCapture.flashMode = if (isFlashOn) ImageCapture.FLASH_MODE_OFF else ImageCapture.FLASH_MODE_ON isFlashOn = !isFlashOn @@ -349,6 +354,10 @@ class PhotoImageActivity : AppCompatActivity(), TextRecognitionProcessor.TextRec } private fun takePhoto() { + if (!::imageCapture.isInitialized) { + Log.e(TAG, "ImageCapture is not initialized") + return + } fbFrom = "photo" val photoFile = File( outputDirectory, diff --git a/app/src/main/res/drawable-xxxhdpi/ic_ph_recap_11111.webp b/app/src/main/res/drawable-xxxhdpi/ic_ph_recap_11111.webp new file mode 100644 index 0000000000000000000000000000000000000000..75afd5e5106ab6b1434fbc80c374932a44818ae7 GIT binary patch literal 764 zcmVL56195fDs18~qfNF0EJchSE&v_|}K_F{QNB+I5>T zqz{+5c9r@GBgRf%*QAnYn^av-=x1GdwFfT#gE9SKnd z7Iz>-6}ZWPkW?V!S7Ca2EpHoNmr}|!{rFGt(1Eva6908ufBhR#f_FdGb2-1jq6AwQ zj@-hNXhBZnkyikyYH)Squ{hwO2R9jy1rSBp;&_~at_XP@kAkWS?{2t)tP5KJ)}bg# z8S+**_N>qFn|WN!+mE#CaOlOnw3{~%mKS|wtOW>NnT$GA0^lCHRLF3^tV#pYc!*sQ z3XsQx?223fSI2|PdK3Vd#{-fY6aWa1@esNe%M%dmaPSW$C@%ni$$czfQR4pQ*@u*J zt+l_}>)Z4?e1oV1(HPEFf8`2|P2b2y+am4#;zry2 zowkKW+kR>E8@JLnxzo1TXxo*RH<7~sFYe}5>mJ#<9Id-J>pZe;84%k7fW@*50Iu8B z{S%~H)djC(H!9-2bc=exr*5&QI(#YFmKyMfF6O#h&})tk9|8bYP&goD0002c2LPP` zDu4ib06vjOpG&2rBB7)R0I(7XX>Q?h&;nThO5Xlgp`(BS1rsolN=U`f(nc + + diff --git a/app/src/main/res/drawable/ic_reshoot.xml b/app/src/main/res/drawable/ic_reshoot.xml new file mode 100644 index 0000000..5873e45 --- /dev/null +++ b/app/src/main/res/drawable/ic_reshoot.xml @@ -0,0 +1,12 @@ + + + + diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml index 13512ea..976b447 100644 --- a/app/src/main/res/layout/activity_history.xml +++ b/app/src/main/res/layout/activity_history.xml @@ -8,6 +8,11 @@ android:background="@color/main_text_ffffffff" tools:context=".viewui.HistoryActivity"> + + + diff --git a/app/src/main/res/menu/language_menu.xml b/app/src/main/res/menu/language_menu.xml new file mode 100644 index 0000000..c15b99f --- /dev/null +++ b/app/src/main/res/menu/language_menu.xml @@ -0,0 +1,9 @@ + + + + + diff --git a/app/src/main/res/menu/popup_menu.xml b/app/src/main/res/menu/popup_menu.xml new file mode 100644 index 0000000..c1fb417 --- /dev/null +++ b/app/src/main/res/menu/popup_menu.xml @@ -0,0 +1,8 @@ + + + + + + diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml new file mode 100644 index 0000000..5bb8834 --- /dev/null +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -0,0 +1,94 @@ + + Translark + ca-app-pub-9280511366580942~8779388277 + + ih + grtib + slt + stc + pdpg + clv + Select image + + + 设置 + 翻译 + 中文 + 英文 + 输入文本\n支持智能识别语言类型 + 粘贴 + 剪贴板中没有有效数据。 + 您的设备可能不支持语音转文字。 + + 翻译 + 快速翻译 + 设置 + 图片翻译 + 词典 + %1$d/1800 + + + 请拍摄文本以进行翻译 + + 语言 + + + 新翻译 + 最近使用 + 所有语言 + 暂不支持该语言的语音功能。 + 准备朗读… + 翻译器 + 翻译失败：请检查网络连接。 + 翻译中… + + + 全局翻译 + 复制文本 + 图片翻译 + 区域翻译 + 重置 + 请选择要翻译的区域 + 全选 + 全部复制 + + + 删除 + 历史记录 + 暂无历史记录... + 收藏夹 + 暂无收藏... + 立即翻译 + + + 设置 + 应用语言 + 版本 + 隐私政策 + 分享应用 + 收藏 + 评分 + 您的鼓励是我们前进的动力！ + 透明度 + 悬浮球显示时的透明度 + 自动折叠时间 + 3秒 + 固定悬浮球 + 重置 + 拖拽翻译完成松手后，悬浮球会回到固定位置，如果想改变位置可点击悬浮球在功能面板移动 + 感谢您的反馈。我们会做得更好。 + 清除以上设置，并恢复默认样式 + 全局翻译 + 透明背景 + 全局翻译时文字使用透明背景 + 自动识别文字背景和颜色，开启后下面设置的文字颜色和背景将失效 + 点击无文字的空表区域，关闭全局翻译页面 + 点击空白区域关闭 + 智能背景 + 快捷操作 + 悬浮球设置 + 长按悬浮球 + 打开应用 + 双击悬浮球 + 翻译后点击“收藏”按钮。\n轻松收藏句子。 + \ No newline at end of file