Refactoring code

timscriptov · timscriptov · commit d150bc216f8e · 2021-07-09T03:40:45.000+05:00
diff --git a/app/src/main/java/com/mcal/disassembler/activities/ClassActivity.java b/app/src/main/java/com/mcal/disassembler/activities/ClassActivity.java
@@ -29,8 +29,8 @@
 import com.mcal.disassembler.util.ClassGeter;
 import com.mcal.disassembler.util.FileSaver;
 import com.mcal.disassembler.util.HeaderGenerator;
-import com.mcal.materialdesign.view.CenteredToolBar;
 import com.mcal.disassembler.vtable.VtableDumper;
+import com.mcal.materialdesign.view.CenteredToolBar;
 import com.mcal.materialdesign.widgets.SnackBar;
 
 import org.jetbrains.annotations.NotNull;
diff --git a/app/src/main/java/com/mcal/disassembler/activities/SymbolActivity.java b/app/src/main/java/com/mcal/disassembler/activities/SymbolActivity.java
@@ -13,9 +13,9 @@
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.nativeapi.DisassemblerVtable;
 import com.mcal.disassembler.nativeapi.Dumper;
-import com.mcal.materialdesign.view.CenteredToolBar;
 import com.mcal.disassembler.vtable.Tables;
 import com.mcal.disassembler.vtable.VtableDumper;
+import com.mcal.materialdesign.view.CenteredToolBar;
 
 import org.jetbrains.annotations.NotNull;
 
diff --git a/app/src/main/res/drawable/ic_window_minimize.xml b/app/src/main/res/drawable/ic_window_minimize.xml
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -7,7 +7,6 @@
     <string name="saving">Сохранение…</string>
     <string name="pickSo">Выберите .so</string>
     <string name="noFile">File Manager не найден.</string>
-    <string name="ownedVtable">Owned Vtable</string>
     <string name="argumentsName">Аргументы:</string>
     <string name="className">Класс:</string>
     <string name="typeName">Тип:</string>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -7,7 +7,6 @@
     <string name="saving">保存中……</string>
     <string name="pickSo">請選擇.so</string>
     <string name="noFile">没有有效的文件管理器</string>
-    <string name="ownedVtable">所有的虚函表</string>
     <string name="argumentsName">参数表:</string>
     <string name="className">类:</string>
     <string name="typeName">类型:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -7,7 +7,6 @@
     <string name="saving">Saving…</string>
     <string name="pickSo">Please pick .so</string>
     <string name="noFile">No File Manager Found.</string>
-    <string name="ownedVtable">Owned Vtable</string>
     <string name="argumentsName">Arguments:</string>
     <string name="className">Class:</string>
     <string name="typeName">Type:</string>
diff --git a/hexviewer/src/main/java/fr/ralala/hexviewer/ui/launchers/LauncherOpen.java b/hexviewer/src/main/java/fr/ralala/hexviewer/ui/launchers/LauncherOpen.java
@@ -4,7 +4,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.util.Log;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 
 import androidx.activity.result.ActivityResultLauncher;
diff --git a/materialdesign/src/main/res/drawable/pref_shadow_bottom.xml b/materialdesign/src/main/res/drawable/pref_shadow_bottom.xml
diff --git a/materialdesign/src/main/res/drawable/pref_shadow_top.xml b/materialdesign/src/main/res/drawable/pref_shadow_top.xml
diff --git a/materialdesign/src/main/res/layout/preference_category.xml b/materialdesign/src/main/res/layout/preference_category.xml
diff --git a/translator/src/main/java/com/mcal/elfeditor/Elf.java b/translator/src/main/java/com/mcal/elfeditor/Elf.java
@@ -45,7 +45,6 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.RandomAccessFile;
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UnknownFormatConversionException;
@@ -102,15 +101,15 @@ public class Elf implements Closeable {
     final byte[] e_ident = new byte[EI_NIDENT]; // ELF Identification bytes
     private final Ehdr mHeader;
     private final Elf_Shdr[] mSectionHeaders;
+    private final LEDataInputStream mReader;
+    private final byte[] mStringTable;
     public List<ItemHelper> dy_items, ro_items;
     // private List<String> mRoDataStrings;
     Elf_Phdr[] mProgHeaders;
     Elf_Sym[] mDynamicSymbols;
     Elf_Sym[] mHashSymbols;
     byte[] mDynStringTable;
     byte[] mDynHashTable;
-    private final LEDataInputStream mReader;
-    private final byte[] mStringTable;
     private byte[] mRoDataStringTable;
     private int num_buckets;
     // semantics.
@@ -361,7 +360,7 @@ private String fillString(String string, int length) {
      */
     public int find(String str) {
         long hash = ELFHash(str);
-        if(num_buckets != 0) {
+        if (num_buckets != 0) {
             for (int i = buckets[(int) (hash % num_buckets)]; i != 0; i = chains[i]) {
                 Elf_Sym ds = mDynamicSymbols[i];
                 String string = getDynString(ds.st_name);
diff --git a/translator/src/main/res/drawable/cursor.xml b/translator/src/main/res/drawable/cursor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <size android:width="1dp" />
+    <solid android:color="@color/colorAccent" />
+</shape>
diff --git a/translator/src/main/res/values-ru/strings.xml b/translator/src/main/res/values-ru/strings.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="app_translate">Переводчик</string>
+    <string name="pickSo">Выберите .so файл</string>
+    <string name="noFile">Файлы не найдены</string>
+    <string name="ok">Ок</string>
+    <string name="no">Нет</string>
+    <string name="cancel">Отмена</string>
+    <string name="not_found">Не найдено!</string>
+    <string name="error">Ошибка</string>
+    <string name="success">Успешно</string>
+    <string name="failure">Неудача</string>
+    <string name="parsing">Парсинг…</string>
+    <string name="saving">Сохранение…</string>
+    <string name="ensure_save">Хотите сохранить файл?</string>
+    <string name="out_of_memory">Памяти не хватило!</string>
+    <string name="copied">Скопировано</string>
+    <string name="err_rename">Ошибка переименования файла: %s</string>
+    <string name="copy">Копировать текст</string>
+    <string name="b64">Расшифровать base64</string>
+    <string name="save">Сохранить</string>
+    <string name="search">Поиск</string>
+    <string name="opened">Открытый файл</string>
+    <string name="go_to">Перейти к строке</string>
+</resources>
diff --git a/translator/src/main/res/values/strings.xml b/translator/src/main/res/values/strings.xml
@@ -5,7 +5,6 @@
     <string name="saving">Saving…</string>
     <string name="pickSo">Please pick .so</string>
     <string name="noFile">No File Manager Found.</string>
-    <!--string name="noSo">No .so Found.</string-->
 
     <string name="ok">OK</string>
     <string name="no">No</string>
