Release 2.3

Author: timscriptov

app/build.gradle

@@ -3,24 +3,25 @@ apply plugin: 'kotlin-android'
 
 android {
     compileSdkVersion 30
-    buildToolsVersion = '30.0.1'
+    buildToolsVersion = '30.0.2'
+    ndkVersion '21.0.6113669'
 
     defaultConfig {
         applicationId "com.mcal.disassembler"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 22
-        versionName "2.2"
-        /*ndk {
+        versionCode 23
+        versionName "2.3"
+        ndk {
             abiFilters 'armeabi-v7a', 'x86', 'arm64-v8a', 'x86_64'
-        }*/
+        }
     }
 
-    /*externalNativeBuild {
+    externalNativeBuild {
         ndkBuild {
             path 'src/main/jni/Android.mk'
         }
-    }*/
+    }
 
     buildTypes {
         release {
@@ -45,10 +46,10 @@ dependencies {
     implementation "androidx.core:core-ktx:1.3.1"
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.10"
     implementation 'org.jetbrains:annotations:19.0.0'
 
-	implementation 'com.google.android.material:material:1.2.0'
+	implementation 'com.google.android.material:material:1.2.1'
 
 	implementation 'com.anjlab.android.iab.v3:library:1.1.0'
     implementation  'com.jakewharton:butterknife:8.5.1'

app/src/main/AndroidManifest.xml

@@ -6,6 +6,7 @@
 
 	<!--uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>  
 	<uses-permission android:name="android.permission.READ_PHONE_STATE" /-->
+	<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 	<uses-permission android:name="com.android.vending.BILLING" />
 
@@ -15,15 +16,17 @@
 		android:roundIcon="@mipmap/ic_launcher_round"
 		android:name="com.mcal.disassembler.App"
 		android:largeHeap="true"
+		android:testOnly="false"
+		android:debuggable="false"
 		android:theme="@style/AppTheme"
-		android:allowBackup="true"
-		android:fullBackupContent="true"
+		android:allowBackup="false"
+		android:fullBackupContent="false"
 		android:requestLegacyExternalStorage="true"
-		tools:ignore="GoogleAppIndexingWarning"
+		tools:ignore="GoogleAppIndexingWarning,HardcodedDebugMode"
 		tools:targetApi="q">
 
         <activity
-			android:name="com.mcal.disassembler.activities.MainActivity"
+			android:name=".activities.MainActivity"
 			android:label="@string/app_name">
 
             <intent-filter>
@@ -37,31 +40,31 @@
         </activity>
 
 		<activity
-			android:name="com.mcal.disassembler.activities.SymbolsActivity"
+			android:name=".activities.SymbolsActivity"
 			android:label="@string/symbolsActivity"/>
 
 		<activity
-			android:name="com.mcal.disassembler.activities.ClassActivity"
+			android:name=".activities.ClassActivity"
 			android:label="@string/classActivity"/>
 
 		<activity
-			android:name="com.mcal.disassembler.activities.SymbolActivity"
+			android:name=".activities.SymbolActivity"
 			android:label="@string/symbolActivity"/>
 
 		<activity
-			android:name="com.mcal.disassembler.activities.MenuActivity"
+			android:name=".activities.MenuActivity"
 			android:label="@string/menuActivity"/>
 
 		<activity
-			android:name="com.mcal.disassembler.activities.SearchActivity"
+			android:name=".activities.SearchActivity"
 			android:label="@string/searchActivity"/>
 
 		<activity
-			android:name="com.mcal.disassembler.activities.VtableActivity"
+			android:name=".activities.VtableActivity"
 			android:label="@string/vtableActivity"/>
 
 		<activity
-			android:name="com.mcal.disassembler.activities.NameDemanglerActivity"
+			android:name=".activities.NameDemanglerActivity"
 			android:label="@string/nameDemangler"/>
 
 		<provider

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

@@ -21,7 +21,6 @@
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 
-import com.google.android.material.appbar.MaterialToolbar;
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.nativeapi.DisassemblerClass;
 import com.mcal.disassembler.nativeapi.DisassemblerSymbol;
@@ -30,6 +29,7 @@
 import com.mcal.disassembler.util.ClassGeter;
 import com.mcal.disassembler.util.FileSaver;
 import com.mcal.disassembler.util.HeaderGenerator;
+import com.mcal.disassembler.view.CenteredToolBar;
 import com.mcal.disassembler.vtable.VtableDumper;
 import com.mcal.disassembler.widgets.SnackBar;
 
@@ -59,7 +59,7 @@ public void handleMessage(Message msg) {
             }
         }
     };
-    private MaterialToolbar toolbar;
+    private CenteredToolBar toolbar;
     private String path;
     private String name;
     private List<Map<String, Object>> data;

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

@@ -12,15 +12,13 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
-import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
-import com.google.android.material.appbar.MaterialToolbar;
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.adapters.ListAdapter;
 import com.mcal.disassembler.data.Database;
@@ -29,6 +27,7 @@
 import com.mcal.disassembler.interfaces.MainView;
 import com.mcal.disassembler.nativeapi.DisassemblerDumper;
 import com.mcal.disassembler.nativeapi.Dumper;
+import com.mcal.disassembler.view.CenteredToolBar;
 import com.mcal.disassembler.widgets.SnackBar;
 import com.nbsp.materialfilepicker.MaterialFilePicker;
 import com.nbsp.materialfilepicker.ui.FilePickerActivity;
@@ -44,7 +43,7 @@ public class MainActivity extends AppCompatActivity implements MainView {
     }
 
     ProgressDialog dialog;
-    private MaterialToolbar toolbar;
+    private CenteredToolBar toolbar;
     private RecyclerView recentOpened;
     private ArrayList<String> paths = new ArrayList<>();
     private String path;

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

@@ -16,10 +16,10 @@
 
 import com.anjlab.android.iab.v3.BillingProcessor;
 import com.anjlab.android.iab.v3.TransactionDetails;
-import com.google.android.material.appbar.MaterialToolbar;
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.nativeapi.Dumper;
 import com.mcal.disassembler.util.FileSaver;
+import com.mcal.disassembler.view.CenteredToolBar;
 import com.mcal.disassembler.view.FloatingButton;
 import com.mcal.disassembler.widgets.SnackBar;
 
@@ -34,7 +34,7 @@ public class MenuActivity extends AppCompatActivity implements BillingProcessor.
     private BillingProcessor bp;
     private ProgressDialog mDialog;
     private SnackBar mBar;
-    private MaterialToolbar toolbar;
+    private CenteredToolBar toolbar;
 
     @SuppressLint("HandlerLeak")
     private Handler mHandler = new Handler() {

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

@@ -8,14 +8,14 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.AppCompatEditText;
 
-import com.google.android.material.appbar.MaterialToolbar;
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.nativeapi.DisassemblerDumper;
+import com.mcal.disassembler.view.CenteredToolBar;
 
 import org.jetbrains.annotations.NotNull;
 
 public class NameDemanglerActivity extends AppCompatActivity {
-    private MaterialToolbar toolbar;
+    private CenteredToolBar toolbar;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

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

@@ -21,11 +21,11 @@
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 
-import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.textfield.TextInputEditText;
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.nativeapi.DisassemblerSymbol;
 import com.mcal.disassembler.nativeapi.Searcher;
+import com.mcal.disassembler.view.CenteredToolBar;
 
 import org.jetbrains.annotations.NotNull;
 
@@ -42,8 +42,6 @@ public class SearchActivity extends AppCompatActivity {
     private List<Map<String, Object>> data;
     private String path;
     private ListView list;
-    private MaterialToolbar toolbar;
-
     @SuppressLint("HandlerLeak")
     Handler mHandler = new Handler() {
         @Override
@@ -69,6 +67,7 @@ public void handleMessage(Message msg) {
             }
         }
     };
+    private CenteredToolBar toolbar;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

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

@@ -10,10 +10,10 @@
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 
-import com.google.android.material.appbar.MaterialToolbar;
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.nativeapi.DisassemblerVtable;
 import com.mcal.disassembler.nativeapi.Dumper;
+import com.mcal.disassembler.view.CenteredToolBar;
 import com.mcal.disassembler.vtable.Tables;
 import com.mcal.disassembler.vtable.VtableDumper;
 
@@ -23,7 +23,7 @@
 
 public class SymbolActivity extends AppCompatActivity {
     ProgressDialog dialog;
-    private MaterialToolbar toolbar;
+    private CenteredToolBar toolbar;
     private String path;
     private String name;
     private String className;

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

@@ -16,9 +16,9 @@
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 
-import com.google.android.material.appbar.MaterialToolbar;
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.nativeapi.Dumper;
+import com.mcal.disassembler.view.CenteredToolBar;
 import com.mcal.disassembler.widgets.SnackBar;
 
 import org.jetbrains.annotations.NotNull;
@@ -33,7 +33,7 @@ public class SymbolsActivity extends AppCompatActivity {
     SnackBar bar;
     private List<Map<String, Object>> data;
     private String path;
-    private MaterialToolbar toolbar;
+    private CenteredToolBar toolbar;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {

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

@@ -18,12 +18,12 @@
 import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 
-import com.google.android.material.appbar.MaterialToolbar;
 import com.mcal.disassembler.R;
 import com.mcal.disassembler.nativeapi.DisassemblerDumper;
 import com.mcal.disassembler.nativeapi.DisassemblerVtable;
 import com.mcal.disassembler.nativeapi.Dumper;
 import com.mcal.disassembler.util.FileSaver;
+import com.mcal.disassembler.view.CenteredToolBar;
 import com.mcal.disassembler.widgets.SnackBar;
 
 import org.jetbrains.annotations.NotNull;
@@ -35,7 +35,7 @@
 import java.util.Objects;
 
 public class VtableActivity extends AppCompatActivity {
-    private MaterialToolbar toolbar;
+    private CenteredToolBar toolbar;
     private List<Map<String, Object>> data;
 
     private String path;