version 1.0.5 release_add res

.idea/misc.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
@@ -6,4 +7,11 @@
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="VisualizationToolProject">
+    <option name="state">
+      <ProjectState>
+        <option name="scale" value="0.6140340904708621" />
+      </ProjectState>
+    </option>
+  </component>
 </project>

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()
+        }
+
     }
 
 }

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

app/src/main/java/com/assimilate/alltrans/model/PreferenceLanguageUtils.kt

@@ -50,6 +50,7 @@ object PreferenceLanguageUtils {
             }
         }
         editor.apply()
+
     }
 
     fun addRecentLanguage(language: Language) {

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
                 }
             })

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,

app/src/main/res/drawable/ic_dic_more.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M512,256a85.3,85.3 0,1 1,0 -170.7,85.3 85.3,0 0,1 0,170.7zM512,597.3a85.3,85.3 0,1 1,0 -170.7,85.3 85.3,0 0,1 0,170.7zM512,938.7a85.3,85.3 0,1 1,0 -170.7,85.3 85.3,0 0,1 0,170.7z"
+      android:fillColor="#1F1724"/>
+</vector>

app/src/main/res/drawable/ic_reshoot.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="38dp"
+    android:height="38dp"
+    android:viewportWidth="1024"
+    android:viewportHeight="1024">
+  <path
+      android:pathData="M597.5,512c0,-47.1 -38.4,-85.5 -85.5,-85.5S426.5,464.9 426.5,512s38.4,85.5 85.5,85.5 85.5,-38.4 85.5,-85.5z"
+      android:fillColor="#F1E5E5"/>
+  <path
+      android:pathData="M987.1,452.6c-26.1,-208.9 -188.4,-383 -407,-414.2C360.4,6.7 154.6,129.5 71.7,324.1c-9.7,22.5 5.1,47.6 29.2,51.2 16.4,2.6 32.8,-6.7 39.4,-22C209.9,188.4 384,85 569.3,111.6c156.7,22.5 279.6,132.1 326.7,272.9L780.3,317.4c-17.9,-10.2 -40.4,-4.6 -50.7,13.3s-4.6,40.4 13.3,50.7L931.8,492s22,12.8 41.5,-2.6c16.9,-13.8 13.8,-36.9 13.8,-36.9zM923.6,648.7c-16.4,-2.6 -32.8,6.7 -39.4,22 -70.1,164.4 -244.2,268.3 -429.6,241.7 -156.7,-22.5 -279.6,-132.1 -326.7,-272.9L243.7,706.6c17.9,10.2 40.4,4.6 50.7,-13.3s4.6,-40.4 -13.3,-50.7L92.2,532s-17.4,-10.8 -34.8,-1.5c-24.6,13.3 -20.5,41 -20.5,41 26.1,208.9 188.4,383 407,414.2 219.6,31.7 425.5,-91.1 508.4,-286.2 9.7,-22 -5.1,-47.1 -28.7,-50.7z"
+      android:fillColor="#F1E2E2"/>
+</vector>

app/src/main/res/layout/activity_history.xml

@@ -8,6 +8,11 @@
     android:background="@color/main_text_ffffffff"
     tools:context=".viewui.HistoryActivity">
 
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+    </com.google.android.material.appbar.AppBarLayout>
 
     <ImageView
         android:id="@+id/iv_his_back"

app/src/main/res/layout/activity_main.xml

@@ -205,14 +205,14 @@
                 android:id="@+id/home_native"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="16dp"
                 android:background="@drawable/button_r20_white_bg" />
 
             <LinearLayout
                 android:id="@+id/ll_main_quick"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
                 android:background="@drawable/button_r20_white_bg"
                 android:orientation="vertical"
                 android:padding="16dp">

app/src/main/res/menu/language_menu.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/language_english"
+        android:title="@string/language_english" />
+    <item
+        android:id="@+id/language_chinese"
+        android:title="@string/language_chinese" />
+</menu>

app/src/main/res/menu/popup_menu.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- res/menu/popup_menu.xml -->
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/action_one"
+        android:title="@string/dic_open_in"/>
+
+</menu>

app/src/main/res/values-zh-rCN/strings.xml

@@ -0,0 +1,94 @@
+<resources>
+    <string name="app_name">Translark</string>
+    <string name="my_admob_app_id">ca-app-pub-9280511366580942~8779388277</string>
+    <!--system-->
+    <string name="pref_key_info_hide" translatable="false">ih</string>
+    <string name="pref_key_group_recognized_text_in_blocks" translatable="false">grtib</string>
+    <string name="pref_key_show_language_tag" translatable="false">slt</string>
+    <string name="pref_key_show_text_confidence" translatable="false">stc</string>
+    <string name="pref_key_pose_detector_prefer_gpu" translatable="false">pdpg</string>
+    <string name="pref_key_camera_live_viewport" translatable="false">clv</string>
+    <string name="select_image" translatable="false">Select image</string>
+
+    <!--main_page-->
+    <string name="menu_item_settings" translatable="false">设置</string>
+    <string name="text_main_title">翻译</string>
+    <string name="text_source_language">中文</string>
+    <string name="text_target_language">英文</string>
+    <string name="main_text_enter">输入文本\n支持智能识别语言类型</string>
+    <string name="main_paste_text">粘贴</string>
+    <string name="main_paste_empty">剪贴板中没有有效数据。</string>
+    <string name="main_voice_to_text">您的设备可能不支持语音转文字。</string>
+
+    <string name="main_try_text">翻译</string>
+    <string name="main_quick_text">快速翻译</string>
+    <string name="main_quick_set">设置</string>
+    <string name="main_photo_trans">图片翻译</string>
+    <string name="main_dictionary">词典</string>
+    <string name="main_limit_num">%1$d/1800</string>
+
+    <!--photo-->
+    <string name="ph_toast">请拍摄文本以进行翻译</string>
+    <!--change_page-->
+    <string name="ch_title">语言</string>
+
+    <!--text_re_page-->
+    <string name="tr_add_new">新翻译</string>
+    <string name="tr_common">最近使用</string>
+    <string name="tr_other">所有语言</string>
+    <string name="tr_tts_error">暂不支持该语言的语音功能。</string>
+    <string name="tr_tts_reading">准备朗读…</string>
+    <string name="tr_title">翻译器</string>
+    <string name="tr_trans_fail">翻译失败：请检查网络连接。</string>
+    <string name="tr_trans_ing">翻译中…</string>
+
+    <!--sus_view-->
+    <string name="global_translation">全局翻译</string>
+    <string name="copy_text">复制文本</string>
+    <string name="photo_translation">图片翻译</string>
+    <string name="district_translation">区域翻译</string>
+    <string name="sus_copy_reset">重置</string>
+    <string name="select_toast">请选择要翻译的区域</string>
+    <string name="sus_copy_selectall">全选</string>
+    <string name="sus_copy_copyall">全部复制</string>
+
+    <!--his_page-->
+    <string name="his_delete">删除</string>
+    <string name="his_title">历史记录</string>
+    <string name="his_emtpoy">暂无历史记录...</string>
+    <string name="favor_title">收藏夹</string>
+    <string name="favor_emtpoy">暂无收藏...</string>
+    <string name="translate_now">立即翻译</string>
+
+    <!--settings_page-->
+    <string name="settings">设置</string>
+    <string name="languages">应用语言</string>
+    <string name="version_update">版本</string>
+    <string name="privacy_policy">隐私政策</string>
+    <string name="share_app">分享应用</string>
+    <string name="favorite">收藏</string>
+    <string name="rate">评分</string>
+    <string name="sheet_text">您的鼓励是我们前进的动力！</string>
+    <string name="quick_set_touming">透明度</string>
+    <string name="quick_set_touming_descri">悬浮球显示时的透明度</string>
+    <string name="quick_set_zd_time">自动折叠时间</string>
+    <string name="quick_set_zd_time_num">3秒</string>
+    <string name="quick_set_gd_xfq">固定悬浮球</string>
+    <string name="quick_set_reset">重置</string>
+    <string name="quick_set_gd_description">拖拽翻译完成松手后，悬浮球会回到固定位置，如果想改变位置可点击悬浮球在功能面板移动</string>
+    <string name="settings_rate_toast">感谢您的反馈。我们会做得更好。</string>
+    <string name="quick_set_reset_description">清除以上设置，并恢复默认样式</string>
+    <string name="quick_set_qj_title">全局翻译</string>
+    <string name="quick_set_qj_tmbg">透明背景</string>
+    <string name="quick_set_qj_tmbg_description">全局翻译时文字使用透明背景</string>
+    <string name="quick_set_qj_color">自动识别文字背景和颜色，开启后下面设置的文字颜色和背景将失效</string>
+    <string name="quick_set_qj_kbgb">点击无文字的空表区域，关闭全局翻译页面</string>
+    <string name="quick_set_qj_kbgb_t">点击空白区域关闭</string>
+    <string name="quick_set_qj_color_t">智能背景</string>
+    <string name="quick_set_kj_t">快捷操作</string>
+    <string name="quick_sus_xf_set">悬浮球设置</string>
+    <string name="quick_set_kj_long">长按悬浮球</string>
+    <string name="quick_set_kj_long_to">打开应用</string>
+    <string name="quick_set_kj_double">双击悬浮球</string>
+    <string name="fav_emp_description">翻译后点击“收藏”按钮。\n轻松收藏句子。</string>
+</resources>