Skip to content

Commit d150bc2

Browse files
timscriptovtimscriptov
committed
Refactoring code
1 parent 16733ac commit d150bc2

File tree

14 files changed

+36
-19
lines changed

14 files changed

+36
-19
lines changed

‎app/src/main/java/com/mcal/disassembler/activities/ClassActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
import com.mcal.disassembler.util.ClassGeter;
3030
import com.mcal.disassembler.util.FileSaver;
3131
import com.mcal.disassembler.util.HeaderGenerator;
32-
import com.mcal.materialdesign.view.CenteredToolBar;
3332
import com.mcal.disassembler.vtable.VtableDumper;
33+
import com.mcal.materialdesign.view.CenteredToolBar;
3434
import com.mcal.materialdesign.widgets.SnackBar;
3535

3636
import org.jetbrains.annotations.NotNull;

‎app/src/main/java/com/mcal/disassembler/activities/SymbolActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313
import com.mcal.disassembler.R;
1414
import com.mcal.disassembler.nativeapi.DisassemblerVtable;
1515
import com.mcal.disassembler.nativeapi.Dumper;
16-
import com.mcal.materialdesign.view.CenteredToolBar;
1716
import com.mcal.disassembler.vtable.Tables;
1817
import com.mcal.disassembler.vtable.VtableDumper;
18+
import com.mcal.materialdesign.view.CenteredToolBar;
1919

2020
import org.jetbrains.annotations.NotNull;
2121

‎app/src/main/res/drawable/ic_window_minimize.xml

-8
This file was deleted.

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

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<string name="saving">Сохранение…</string>
88
<string name="pickSo">Выберите .so</string>
99
<string name="noFile">File Manager не найден.</string>
10-
<string name="ownedVtable">Owned Vtable</string>
1110
<string name="argumentsName">Аргументы:</string>
1211
<string name="className">Класс:</string>
1312
<string name="typeName">Тип:</string>

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

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<string name="saving">保存中……</string>
88
<string name="pickSo">請選擇.so</string>
99
<string name="noFile">没有有效的文件管理器</string>
10-
<string name="ownedVtable">所有的虚函表</string>
1110
<string name="argumentsName">参数表:</string>
1211
<string name="className">类:</string>
1312
<string name="typeName">类型:</string>

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

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
<string name="saving">Saving…</string>
88
<string name="pickSo">Please pick .so</string>
99
<string name="noFile">No File Manager Found.</string>
10-
<string name="ownedVtable">Owned Vtable</string>
1110
<string name="argumentsName">Arguments:</string>
1211
<string name="className">Class:</string>
1312
<string name="typeName">Type:</string>

‎hexviewer/src/main/java/fr/ralala/hexviewer/ui/launchers/LauncherOpen.java

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import android.content.Intent;
55
import android.net.Uri;
66
import android.util.Log;
7-
import android.widget.LinearLayout;
87
import android.widget.RelativeLayout;
98

109
import androidx.activity.result.ActivityResultLauncher;

‎hexviewer/src/main/res/drawable/pref_shadow_bottom.xml renamed to ‎materialdesign/src/main/res/drawable/pref_shadow_bottom.xml

File renamed without changes.

‎hexviewer/src/main/res/drawable/pref_shadow_top.xml renamed to ‎materialdesign/src/main/res/drawable/pref_shadow_top.xml

File renamed without changes.

‎hexviewer/src/main/res/layout/preference_category.xml renamed to ‎materialdesign/src/main/res/layout/preference_category.xml

File renamed without changes.

‎translator/src/main/java/com/mcal/elfeditor/Elf.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import java.io.InputStream;
4646
import java.io.OutputStream;
4747
import java.io.RandomAccessFile;
48-
import java.io.UnsupportedEncodingException;
4948
import java.util.ArrayList;
5049
import java.util.List;
5150
import java.util.UnknownFormatConversionException;
@@ -102,15 +101,15 @@ public class Elf implements Closeable {
102101
final byte[] e_ident = new byte[EI_NIDENT]; // ELF Identification bytes
103102
private final Ehdr mHeader;
104103
private final Elf_Shdr[] mSectionHeaders;
104+
private final LEDataInputStream mReader;
105+
private final byte[] mStringTable;
105106
public List<ItemHelper> dy_items, ro_items;
106107
// private List<String> mRoDataStrings;
107108
Elf_Phdr[] mProgHeaders;
108109
Elf_Sym[] mDynamicSymbols;
109110
Elf_Sym[] mHashSymbols;
110111
byte[] mDynStringTable;
111112
byte[] mDynHashTable;
112-
private final LEDataInputStream mReader;
113-
private final byte[] mStringTable;
114113
private byte[] mRoDataStringTable;
115114
private int num_buckets;
116115
// semantics.
@@ -361,7 +360,7 @@ private String fillString(String string, int length) {
361360
*/
362361
public int find(String str) {
363362
long hash = ELFHash(str);
364-
if(num_buckets != 0) {
363+
if (num_buckets != 0) {
365364
for (int i = buckets[(int) (hash % num_buckets)]; i != 0; i = chains[i]) {
366365
Elf_Sym ds = mDynamicSymbols[i];
367366
String string = getDynString(ds.st_name);

‎translator/src/main/res/drawable/cursor.xml

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="rectangle">
4+
<size android:width="1dp" />
5+
<solid android:color="@color/colorAccent" />
6+
</shape>

‎translator/src/main/res/values-ru/strings.xml

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<resources>
3+
<string name="app_translate">Переводчик</string>
4+
<string name="pickSo">Выберите .so файл</string>
5+
<string name="noFile">Файлы не найдены</string>
6+
<string name="ok">Ок</string>
7+
<string name="no">Нет</string>
8+
<string name="cancel">Отмена</string>
9+
<string name="not_found">Не найдено!</string>
10+
<string name="error">Ошибка</string>
11+
<string name="success">Успешно</string>
12+
<string name="failure">Неудача</string>
13+
<string name="parsing">Парсинг…</string>
14+
<string name="saving">Сохранение…</string>
15+
<string name="ensure_save">Хотите сохранить файл?</string>
16+
<string name="out_of_memory">Памяти не хватило!</string>
17+
<string name="copied">Скопировано</string>
18+
<string name="err_rename">Ошибка переименования файла: %s</string>
19+
<string name="copy">Копировать текст</string>
20+
<string name="b64">Расшифровать base64</string>
21+
<string name="save">Сохранить</string>
22+
<string name="search">Поиск</string>
23+
<string name="opened">Открытый файл</string>
24+
<string name="go_to">Перейти к строке</string>
25+
</resources>

‎translator/src/main/res/values/strings.xml

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
<string name="saving">Saving…</string>
66
<string name="pickSo">Please pick .so</string>
77
<string name="noFile">No File Manager Found.</string>
8-
<!--string name="noSo">No .so Found.</string-->
98

109
<string name="ok">OK</string>
1110
<string name="no">No</string>

0 commit comments

Comments
 (0)