6.6.2 - Alpha4 - 修复 Rhino 引擎升级后打包应用无法使用正则表达式及 XML 语法的问题

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

@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="16dp">
+    android:fitsSystemWindows="true">
 
     <org.autojs.autojs.ui.common.NestedOuterScrollView
         android:id="@+id/outerScrollView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:clipToPadding="false"
+        android:paddingVertical="2sp"
         android:scrollbars="vertical">
 
         <HorizontalScrollView
             android:id="@+id/innerScrollView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:paddingHorizontal="8sp"
             android:scrollbars="horizontal">
 
             <org.autojs.autojs.ui.widget.SelectableTextView
@@ -23,7 +26,6 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:textAppearance="?android:attr/textAppearanceSmall"
-                android:padding="16dp"
                 android:scrollbars="vertical"
                 android:fontFamily="monospace" />
 

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

@@ -3,6 +3,12 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         app:popupTheme="@style/Widget.AppCompat.PopupMenu">
 
+    <item
+        android:id="@+id/action_use_default_icon"
+        android:icon="@mipmap/ic_launcher"
+        android:title="@string/text_use_default_icon"
+        app:showAsAction="never"/>
+
     <item
         android:id="@+id/action_select_image"
         android:icon="@drawable/ic_insert_photo_white_48dp"

app/src/main/res/values-ar/strings.xml

@@ -731,6 +731,7 @@
     <string name="text_select_file_to_upload">حدد ملف للتحميل</string>
     <string name="text_select_icon">حدد أيقونة</string>
     <string name="text_select_image">حدد صورة</string>
+    <string name="text_use_default_icon">استخدام الرمز الافتراضي</string>
     <string name="text_send">إرسال</string>
     <string name="text_send_shortcut">انشاء اختصار</string>
     <string name="text_server_mode">وضع الخادم</string>

app/src/main/res/values-en/strings.xml

@@ -727,6 +727,7 @@
     <string name="text_select_file_to_upload">Select file to upload</string>
     <string name="text_select_icon">Select icon</string>
     <string name="text_select_image">Select an image</string>
+    <string name="text_use_default_icon">Use default icon</string>
     <string name="text_send">Send</string>
     <string name="text_send_shortcut">Create shortcut</string>
     <string name="text_server_mode">Server mode</string>

app/src/main/res/values-es/strings.xml

@@ -730,6 +730,7 @@
     <string name="text_select_file_to_upload">Seleccionar el archivo a cargar</string>
     <string name="text_select_icon">Seleccionar un icono</string>
     <string name="text_select_image">Seleccionar una imagen</string>
+    <string name="text_use_default_icon">Usar icono predeterminado</string>
     <string name="text_send">Enviar</string>
     <string name="text_send_shortcut">Crear acceso directo</string>
     <string name="text_server_mode">Modo servidor</string>

app/src/main/res/values-fr/strings.xml

@@ -730,6 +730,7 @@
     <string name="text_select_file_to_upload">Sélectionnez le fichier à télécharger</string>
     <string name="text_select_icon">Sélectionner l\'icône</string>
     <string name="text_select_image">Sélectionner une image</string>
+    <string name="text_use_default_icon">Utiliser l\'icône par défaut</string>
     <string name="text_send">Envoyer</string>
     <string name="text_send_shortcut">Créer un raccourci</string>
     <string name="text_server_mode">Mode serveur</string>

app/src/main/res/values-ja/strings.xml

@@ -730,6 +730,7 @@
     <string name="text_select_file_to_upload">アップロードするファイルを選択します</string>
     <string name="text_select_icon">アイコンを選択する</string>
     <string name="text_select_image">画像を選択する</string>
+    <string name="text_use_default_icon">デフォルトのアイコンを使用する</string>
     <string name="text_send">送信する</string>
     <string name="text_send_shortcut">ショートカットの作成</string>
     <string name="text_server_mode">サーバーモード</string>

app/src/main/res/values-ko/strings.xml

@@ -731,6 +731,7 @@
     <string name="text_select_file_to_upload">업로드 할 파일을 선택하십시오</string>
     <string name="text_select_icon">아이콘을 선택하십시오</string>
     <string name="text_select_image">이미지를 선택하십시오</string>
+    <string name="text_use_default_icon">기본 아이콘 사용</string>
     <string name="text_send">보내다</string>
     <string name="text_send_shortcut">바로 가기를 만듭니다</string>
     <string name="text_server_mode">서버 모드</string>

app/src/main/res/values-ru/strings.xml

@@ -730,6 +730,7 @@
     <string name="text_select_file_to_upload">Выберите файл для загрузки</string>
     <string name="text_select_icon">Выбрать значок</string>
     <string name="text_select_image">Выбрать изображение</string>
+    <string name="text_use_default_icon">Использовать значок по умолчанию</string>
     <string name="text_send">Отправить</string>
     <string name="text_send_shortcut">Создать ярлык</string>
     <string name="text_server_mode">Режим сервера</string>

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

@@ -729,6 +729,7 @@
     <string name="text_select_file_to_upload">選擇要上傳的文件</string>
     <string name="text_select_icon">選擇圖標</string>
     <string name="text_select_image">選擇圖片</string>
+    <string name="text_use_default_icon">使用默認圖標</string>
     <string name="text_send">發送</string>
     <string name="text_send_shortcut">創建快捷方式</string>
     <string name="text_server_mode">服務端模式</string>

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

@@ -729,6 +729,7 @@
     <string name="text_select_file_to_upload">選擇要上傳的檔案</string>
     <string name="text_select_icon">選擇圖示</string>
     <string name="text_select_image">選擇圖片</string>
+    <string name="text_use_default_icon">使用預設圖示</string>
     <string name="text_send">傳送</string>
     <string name="text_send_shortcut">建立快捷方式</string>
     <string name="text_server_mode">服務端模式</string>

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

@@ -725,6 +725,7 @@
     <string name="text_select_file_to_upload">选择要上传的文件</string>
     <string name="text_select_icon">选择图标</string>
     <string name="text_select_image">选择图片</string>
+    <string name="text_use_default_icon">使用默认图标</string>
     <string name="text_send">发送</string>
     <string name="text_send_shortcut">创建快捷方式</string>
     <string name="text_server_mode">服务端模式</string>

app/src/main/res/values/strings.xml

@@ -935,6 +935,7 @@
     <string name="text_select_file_to_upload">Select file to upload</string>
     <string name="text_select_icon">Select icon</string>
     <string name="text_select_image">Select an image</string>
+    <string name="text_use_default_icon">Use default icon</string>
     <string name="text_send">Send</string>
     <string name="text_send_shortcut">Create shortcut</string>
     <string name="text_server_mode">Server mode</string>