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

Lines changed: 6 additions & 4 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 6 additions & 1 deletion
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

Lines changed: 17 additions & 5 deletions
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 6 additions & 0 deletions
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>

0 commit comments

Comments
 (0)