Upload file

Author: Zenlua

common/src/main/java/com/omarea/common/shared/ObjectStorage.kt

@@ -48,7 +48,7 @@ open class ObjectStorage<T : Serializable>(private val context: Context) {
                 objectOutputStream.writeObject(obj)
                 return true
             } catch (ex: Exception) {
-                Toast.makeText(context, "存储配置失败！", Toast.LENGTH_SHORT).show()
+                Toast.makeText(context, "Storage configuration failed!", Toast.LENGTH_SHORT).show()
                 return false
             } finally {
                 try {

common/src/main/java/com/omarea/common/shell/KeepShell.kt

@@ -137,7 +137,7 @@ class KeepShell(private var rootMode: Boolean = true) {
     fun doCmdSync(cmd: String): String {
         if (mLock.isLocked && enterLockTime > 0 && System.currentTimeMillis() - enterLockTime > LOCK_TIMEOUT) {
             tryExit()
-            Log.e("doCmdSync-Lock", "线程等待超时${System.currentTimeMillis()} - $enterLockTime > $LOCK_TIMEOUT")
+            Log.e("doCmdSync-Lock", "Thread wait timeout ${System.currentTimeMillis()} - $enterLockTime > $LOCK_TIMEOUT")
         }
         getRuntimeShell()
 

common/src/main/java/com/omarea/common/shell/ShellExecutor.java

@@ -33,7 +33,7 @@ private static String getEnvPath() {
                     if (!path.isEmpty()) {
                         defaultEnvPath = path;
                     } else {
-                        throw new RuntimeException("未能获取到$PATH参数");
+                        throw new RuntimeException("Unable to obtain $PATH parameter");
                     }
                 } catch (Exception ex) {
                     defaultEnvPath = "/sbin:/system/sbin:/system/bin:/system/xbin:/odm/bin:/vendor/bin:/vendor/xbin";

common/src/main/java/com/omarea/common/ui/ProgressBarDialog.kt

@@ -90,7 +90,7 @@ open class ProgressBarDialog(private var context: Activity, private var uniqueId
         }
     }
 
-    fun showDialog(text: String = "正在加载，请稍等..."): ProgressBarDialog {
+    fun showDialog(text: String = "Loading, please wait..."): ProgressBarDialog {
         if (textView != null && alert != null) {
             textView!!.text = text
         } else {

common/src/main/java/com/omarea/common/ui/ProgressCircle.kt

@@ -14,7 +14,7 @@ import androidx.core.content.withStyledAttributes
 
 class ProgressCircle : View {
     //-------------必须给的数据相关-------------
-    private val str = arrayOf("已用", "可用")
+    private val str = arrayOf("Already used", "Available")
     private var ratio = 0
     private var ratioState = 0
 

common/src/main/res/layout/dialog_app_chooser.xml

@@ -54,6 +54,7 @@
             android:layout_margin="6dp"
             android:text="@string/select_all"
             android:layoutDirection="rtl"
+            style="@style/textTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />
     </RelativeLayout>

common/src/main/res/layout/dialog_item_chooser.xml

@@ -78,6 +78,7 @@
             android:layout_margin="6dp"
             android:text="@string/select_all"
             android:layoutDirection="rtl"
+            style="@style/textTitle"
             android:layout_alignParentEnd="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content" />

krscript/src/main/java/com/omarea/krscript/ui/PageLayoutRender.kt

@@ -64,7 +64,7 @@ class PageLayoutRender(private val mContext: Context,
             try {
                 val item = findItemByDynamicIndex(key, itemConfigList)
                 if (item == null) {
-                    Log.e("onItemClick", "找不到指定ID的项 index: $key")
+                    Log.e("onItemClick", "Item with the specified ID not found index: $key")
                     return
                 } else {
                     onItemClick(item, listItemView)
@@ -114,7 +114,7 @@ class PageLayoutRender(private val mContext: Context,
                     parent.addView(uiRender)
                 }
             } catch (ex: Exception) {
-                Toast.makeText(mContext, it.title + "界面渲染异常" + ex.message, Toast.LENGTH_SHORT).show()
+                Toast.makeText(mContext, it.title + "Interface rendering error" + ex.message, Toast.LENGTH_SHORT).show()
             }
         }
     }

pio/src/main/assets/home/etc/tool-tree.rc

@@ -341,10 +341,7 @@ $shella5"
 }
 
 Update(){
-if [ -f "$TEMP/update" ];then
-show_update=1
-show_update_text="§"
-fi
+[ -f "$TEMP/update" ] && show_update=1
 xml_print '<group>
 <page icon="'`urlpng like`'" link="https://zenlua.github.io/Tool-Tree/website/Information.html" >
 <title>Kakathic</title>
@@ -389,7 +386,7 @@ fi
 </set>
 </action>
 <text>
-<desc>'"$(cat $TEMP/version.txt 2>/dev/null)"$show_update_text'</desc>
+<desc>'"$(cat $TEMP/version.txt 2>/dev/null)"'</desc>
 </text>
 </group>'
 }