Skip to content

Commit c6d38a2

Browse files
committed
Added Translator
1 parent 6cdce4a commit c6d38a2

File tree

79 files changed

+3320
-514
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+3320
-514
lines changed

app/build.gradle

+6-4
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
minSdkVersion 21
1212
//noinspection OldTargetApi
1313
targetSdkVersion 29
14-
versionCode 29
15-
versionName "2.9"
14+
versionCode 30
15+
versionName "3.0"
1616
ndk {
1717
abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64'
1818
}
@@ -42,10 +42,12 @@ dependencies {
4242
implementation fileTree(dir: 'libs', include: ['*.jar'])
4343
implementation project(':filepicker')
4444
implementation project(':hexviewer')
45+
implementation project(':translator')
46+
implementation project(':materialdesign')
4547
implementation 'androidx.cardview:cardview:1.0.0'
4648
implementation 'androidx.annotation:annotation:1.2.0'
4749
implementation 'androidx.preference:preference-ktx:1.1.1'
48-
implementation "androidx.core:core-ktx:1.5.0"
50+
implementation "androidx.core:core-ktx:1.6.0"
4951
implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
5052

5153
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.20"
@@ -55,7 +57,7 @@ dependencies {
5557

5658
implementation "com.android.billingclient:billing-ktx:4.0.0"
5759

58-
implementation 'com.google.android.material:material:1.3.0'
60+
implementation 'com.google.android.material:material:1.4.0'
5961
implementation 'com.google.android.gms:play-services-ads:20.2.0'
6062

6163
implementation 'com.jakewharton:butterknife:10.2.3'

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
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.disassembler.view.CenteredToolBar;
32+
import com.mcal.materialdesign.view.CenteredToolBar;
3333
import com.mcal.disassembler.vtable.VtableDumper;
34-
import com.mcal.disassembler.widgets.SnackBar;
34+
import com.mcal.materialdesign.widgets.SnackBar;
3535

3636
import org.jetbrains.annotations.NotNull;
3737

app/src/main/java/com/mcal/disassembler/activities/Main.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import com.mcal.disassembler.iap.PurchaseServiceListener;
2828
import com.mcal.disassembler.iap.SubscriptionServiceListener;
2929
import com.mcal.disassembler.util.AdsAdmob;
30-
import com.mcal.disassembler.view.CenteredToolBar;
30+
import com.mcal.materialdesign.view.CenteredToolBar;
3131

3232
import org.jetbrains.annotations.NotNull;
3333

@@ -155,6 +155,11 @@ public void toNameDemangler(View view) {
155155
startActivity(new Intent(this, NameDemanglerActivity.class));
156156
}
157157

158+
public void translator(View view) {
159+
AdsAdmob.showInterestialAd(this, null);
160+
startActivity(new Intent(this, com.mcal.elfeditor.MainActivity.class));
161+
}
162+
158163
public void symbols(View view) {
159164
AdsAdmob.showInterestialAd(this, runSymbols());
160165
}

app/src/main/java/com/mcal/disassembler/activities/MainActivity.java

+17-5
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.Intent;
55
import android.database.Cursor;
66
import android.os.Bundle;
7+
import android.view.MenuItem;
78
import android.view.View;
89
import android.widget.LinearLayout;
910

@@ -13,6 +14,7 @@
1314

1415
import com.developer.filepicker.model.DialogConfigs;
1516
import com.developer.filepicker.model.DialogProperties;
17+
import com.developer.filepicker.utils.ScopedStorage;
1618
import com.developer.filepicker.view.FilePickerDialog;
1719
import com.mcal.disassembler.R;
1820
import com.mcal.disassembler.adapters.ListAdapter;
@@ -22,9 +24,10 @@
2224
import com.mcal.disassembler.nativeapi.DisassemblerDumper;
2325
import com.mcal.disassembler.nativeapi.Dumper;
2426
import com.mcal.disassembler.util.AdsAdmob;
25-
import com.mcal.disassembler.util.ScopedStorage;
26-
import com.mcal.disassembler.view.CenteredToolBar;
27-
import com.mcal.disassembler.widgets.SnackBar;
27+
import com.mcal.materialdesign.view.CenteredToolBar;
28+
import com.mcal.materialdesign.widgets.SnackBar;
29+
30+
import org.jetbrains.annotations.NotNull;
2831

2932
import java.io.File;
3033
import java.util.ArrayList;
@@ -61,8 +64,17 @@ private void setupToolbar(String title) {
6164
CenteredToolBar toolbar = findViewById(R.id.toolbar);
6265
setSupportActionBar(toolbar);
6366
getSupportActionBar().setTitle(title);
64-
getSupportActionBar().setDisplayHomeAsUpEnabled(false);
65-
getSupportActionBar().setDisplayShowHomeEnabled(false);
67+
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
68+
getSupportActionBar().setDisplayShowHomeEnabled(true);
69+
}
70+
71+
@Override
72+
public boolean onOptionsItemSelected(@NotNull MenuItem item) {
73+
if (item.getItemId() == android.R.id.home) {
74+
finish();
75+
return true;
76+
}
77+
return super.onOptionsItemSelected(item);
6678
}
6779

6880
void updateRecents() {

app/src/main/java/com/mcal/disassembler/activities/NameDemanglerActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
import com.mcal.disassembler.R;
1111
import com.mcal.disassembler.nativeapi.DisassemblerDumper;
12-
import com.mcal.disassembler.view.CenteredToolBar;
12+
import com.mcal.materialdesign.view.CenteredToolBar;
1313

1414
import org.jetbrains.annotations.NotNull;
1515

app/src/main/java/com/mcal/disassembler/activities/SearchActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import com.mcal.disassembler.R;
2626
import com.mcal.disassembler.nativeapi.DisassemblerSymbol;
2727
import com.mcal.disassembler.nativeapi.Searcher;
28-
import com.mcal.disassembler.view.CenteredToolBar;
28+
import com.mcal.materialdesign.view.CenteredToolBar;
2929

3030
import org.jetbrains.annotations.NotNull;
3131

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

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

app/src/main/java/com/mcal/disassembler/activities/SymbolsActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@
2424
import com.mcal.disassembler.R;
2525
import com.mcal.disassembler.nativeapi.Dumper;
2626
import com.mcal.disassembler.util.FileSaver;
27-
import com.mcal.disassembler.view.CenteredToolBar;
28-
import com.mcal.disassembler.widgets.SnackBar;
27+
import com.mcal.materialdesign.view.CenteredToolBar;
28+
import com.mcal.materialdesign.widgets.SnackBar;
2929

3030
import org.jetbrains.annotations.NotNull;
3131

app/src/main/java/com/mcal/disassembler/activities/VtableActivity.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
import com.mcal.disassembler.nativeapi.DisassemblerVtable;
2424
import com.mcal.disassembler.nativeapi.Dumper;
2525
import com.mcal.disassembler.util.FileSaver;
26-
import com.mcal.disassembler.view.CenteredToolBar;
27-
import com.mcal.disassembler.widgets.SnackBar;
26+
import com.mcal.materialdesign.view.CenteredToolBar;
27+
import com.mcal.materialdesign.widgets.SnackBar;
2828

2929
import org.jetbrains.annotations.NotNull;
3030

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
2+
<item android:color="@color/colorAccent" android:state_focused="true"/>
3+
<item android:alpha="0.87" android:color="@color/colorAccent" android:state_hovered="true"/>
4+
<item android:alpha="0.12" android:color="@color/colorAccent" android:state_enabled="false"/>
5+
<item android:alpha="0.38" android:color="@color/textColorPrimary"/>
6+
</selector>

app/src/main/res/drawable-night/ic_backup_restore.xml

-10
This file was deleted.

app/src/main/res/drawable-night/ic_delete_empty.xml

-8
This file was deleted.

app/src/main/res/drawable-night/ic_menu.xml

-10
This file was deleted.

app/src/main/res/drawable-night/ic_text_search.xml

-8
This file was deleted.

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

-12
This file was deleted.

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

-10
This file was deleted.

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

-8
This file was deleted.

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

-10
This file was deleted.

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

-8
This file was deleted.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<!-- drawable/translate.xml -->
2+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:height="24dp"
4+
android:width="24dp"
5+
android:viewportWidth="24"
6+
android:viewportHeight="24">
7+
<path android:fillColor="#000" android:pathData="M12.87,15.07L10.33,12.56L10.36,12.53C12.1,10.59 13.34,8.36 14.07,6H17V4H10V2H8V4H1V6H12.17C11.5,7.92 10.44,9.75 9,11.35C8.07,10.32 7.3,9.19 6.69,8H4.69C5.42,9.63 6.42,11.17 7.67,12.56L2.58,17.58L4,19L9,14L12.11,17.11L12.87,15.07M18.5,10H16.5L12,22H14L15.12,19H19.87L21,22H23L18.5,10M15.88,17L17.5,12.67L19.12,17H15.88Z" />
8+
</vector>

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

-14
This file was deleted.

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

-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
tools:ignore="ContentDescription,UsingOnClickInXml" />
5858

5959
<com.google.android.material.floatingactionbutton.FloatingActionButton
60-
android:id="@+id/classactivityButtonFloatSave"
6160
android:layout_width="wrap_content"
6261
android:layout_height="wrap_content"
6362
android:layout_alignParentEnd="true"

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

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:id="@+id/dialog_rootView"
43
android:layout_width="match_parent"
54
android:layout_height="match_parent"
65
android:background="@drawable/dialog_background"

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

+19-9
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
android:orientation="vertical">
88

99
<androidx.drawerlayout.widget.DrawerLayout
10-
android:id="@+id/drawerLayout"
1110
android:layout_width="match_parent"
1211
android:layout_height="match_parent">
1312

@@ -31,9 +30,9 @@
3130
android:orientation="vertical">
3231

3332
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
34-
android:id="@+id/demangle"
35-
android:layout_width="160dp"
33+
android:layout_width="200dp"
3634
android:layout_height="wrap_content"
35+
android:gravity="center"
3736
android:layout_marginBottom="16dp"
3837
android:onClick="toNameDemangler"
3938
android:text="Demangler"
@@ -44,9 +43,9 @@
4443
tools:ignore="HardcodedText,UsingOnClickInXml" />
4544

4645
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
47-
android:id="@+id/hex"
48-
android:layout_width="160dp"
46+
android:layout_width="200dp"
4947
android:layout_height="wrap_content"
48+
android:gravity="center"
5049
android:layout_marginBottom="16dp"
5150
android:onClick="hexViewer"
5251
android:text="HexViewer"
@@ -57,9 +56,10 @@
5756
tools:ignore="HardcodedText,UsingOnClickInXml" />
5857

5958
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
60-
android:id="@+id/symbols"
61-
android:layout_width="160dp"
59+
android:layout_width="200dp"
6260
android:layout_height="wrap_content"
61+
android:gravity="center"
62+
android:layout_marginBottom="16dp"
6363
android:onClick="symbols"
6464
android:text="Symbols"
6565
android:textColor="#FFF"
@@ -68,6 +68,18 @@
6868
app:iconTint="#FFF"
6969
tools:ignore="ContentDescription,UsingOnClickInXml" />
7070

71+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
72+
android:layout_width="200dp"
73+
android:layout_height="wrap_content"
74+
android:gravity="center"
75+
android:onClick="translator"
76+
android:text="Translator"
77+
android:textColor="#FFF"
78+
app:backgroundTint="@color/colorAccent"
79+
app:icon="@drawable/ic_translate"
80+
app:iconTint="#FFF"
81+
tools:ignore="ContentDescription,UsingOnClickInXml" />
82+
7183
<LinearLayout
7284
android:layout_width="match_parent"
7385
android:layout_height="wrap_content"
@@ -76,7 +88,6 @@
7688
android:paddingBottom="10dp">
7789

7890
<com.google.android.material.floatingactionbutton.FloatingActionButton
79-
android:id="@+id/github"
8091
android:layout_width="wrap_content"
8192
android:layout_height="wrap_content"
8293
android:layout_marginTop="16dp"
@@ -98,7 +109,6 @@
98109
tools:ignore="ContentDescription,UsingOnClickInXml" />
99110

100111
<com.google.android.material.floatingactionbutton.FloatingActionButton
101-
android:id="@+id/donate"
102112
android:layout_width="wrap_content"
103113
android:layout_height="wrap_content"
104114
android:layout_marginTop="16dp"

0 commit comments

Comments
 (0)