Release 2.0

Author: timscriptov

ART/web_hi_res_512.png

@@ -41,16 +41,17 @@ dependencies {
 	implementation fileTree(dir: 'libs', include: ['*.jar'])
 	implementation 'androidx.cardview:cardview:1.0.0'
 	implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.preference:preference:1.1.1'
+    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:annotations:19.0.0'
+
 	implementation 'com.google.android.material:material:1.2.0'
+
 	implementation 'com.anjlab.android.iab.v3:library:1.1.0'
     implementation  'com.jakewharton:butterknife:8.5.1'
     //annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0'
     implementation 'com.nineoldandroids:library:2.4.0'
-    implementation 'org.jetbrains:annotations:15.0'
-    implementation "androidx.core:core-ktx:+"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-}
-repositories {
-    mavenCentral()
-}
+}

app/build.gradle

@@ -12,6 +12,7 @@
     <application
 		android:label="@string/app_name"
 		android:icon="@mipmap/ic_launcher"
+		android:roundIcon="@mipmap/ic_launcher_round"
 		android:name=".App"
 		android:largeHeap="true"
 		android:theme="@style/AppTheme"

app/release/app-release.aab

@@ -3,16 +3,24 @@ package com.mcal.disassembler
 import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
+import android.content.SharedPreferences
+import android.preference.PreferenceManager
+import com.mcal.disassembler.data.Database
+import org.jetbrains.annotations.Nullable
 
 class App : Application() {
     override fun onCreate() {
         super.onCreate()
         context = this
+        preferences = PreferenceManager.getDefaultSharedPreferences(this)
+        Database(getContext())
     }
 
     companion object {
         @SuppressLint("StaticFieldLeak")
         private var context: Context? = null
+        private var app: Application? = null
+        private var preferences: SharedPreferences? = null
 
         @JvmStatic
         fun getContext(): Context? {
@@ -21,5 +29,21 @@ class App : Application() {
             }
             return context
         }
+
+        fun getApp(): Application? {
+            if (app == null) {
+                app = App()
+            }
+            return app
+        }
+
+        @JvmStatic
+        @Nullable
+        fun getPreferences(): SharedPreferences {
+            if (preferences == null) {
+                preferences = PreferenceManager.getDefaultSharedPreferences(this.getContext())
+            }
+            return preferences!!
+        }
     }
 }

app/src/main/AndroidManifest.xml

@@ -5,20 +5,16 @@
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.database.DataSetObserver;
 import android.os.Build;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.view.View;
-import android.widget.LinearLayout;
 
 import androidx.appcompat.app.AppCompatActivity;
-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;
 import com.mcal.disassembler.data.RecentsManager;
 import com.mcal.disassembler.interfaces.MainView;
@@ -29,7 +25,6 @@
 import com.nbsp.materialfilepicker.ui.FilePickerActivity;
 
 import java.util.ArrayList;
-import java.util.Objects;
 import java.util.regex.Pattern;
 
 public class MainActivity extends AppCompatActivity implements MainView {
@@ -41,7 +36,7 @@ public class MainActivity extends AppCompatActivity implements MainView {
 
     ProgressDialog dialog;
     private MaterialToolbar toolbar;
-    private LinearLayout welcomeLayout;
+    //private LinearLayout welcomeLayout;
     private RecyclerView recentOpened;
     private ArrayList<String> paths = new ArrayList<>();
     private String path;
@@ -58,9 +53,10 @@ public void onCreate(Bundle savedInstanceState) {
         }
 
         new Database(this);
-        welcomeLayout = findViewById(R.id.welcome_layout);
+        //welcomeLayout = findViewById(R.id.welcome_layout);
         recentOpened = findViewById(R.id.items);
-        setupList();
+
+        //setupList();
     }
 
     @SuppressWarnings("ConstantConditions")
@@ -72,11 +68,12 @@ private void setupToolbar(String title) {
         getSupportActionBar().setDisplayShowHomeEnabled(false);
     }
 
-    public void setupList() {
+    /*public void setupList() {
         Cursor cursor = RecentsManager.getRecents();
         if (cursor.getCount() == 0) {
             recentOpened.setVisibility(View.GONE);
             welcomeLayout.setVisibility(View.VISIBLE);
+            recentOpened.setAdapter(new ListAdapter(paths, this));
         } else {
             welcomeLayout.setVisibility(View.INVISIBLE);
             recentOpened.setVisibility(View.VISIBLE);
@@ -88,7 +85,7 @@ public void setupList() {
             }
             recentOpened.setAdapter(new ListAdapter(paths, this));
         }
-    }
+    }*/
 
     void updateRecents() {
         paths.clear();

app/src/main/java/com/mcal/disassembler/App.kt

@@ -3,6 +3,8 @@
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.Filter;
+import android.widget.Filterable;
 import android.widget.LinearLayout;
 
 import androidx.appcompat.widget.AppCompatImageView;
@@ -15,13 +17,20 @@
 
 import java.util.ArrayList;
 
-public class ListAdapter extends RecyclerView.Adapter<ListAdapter.ViewHolder> {
+public class ListAdapter extends RecyclerView.Adapter<ListAdapter.ViewHolder> implements Filterable {
+    private SearchFilter filter;
     private ArrayList<String> paths;
     private MainView mainView;
 
     public ListAdapter(ArrayList<String> paths, MainView mainView) {
         this.paths = paths;
         this.mainView = mainView;
+        filter = new SearchFilter();
+    }
+
+    @Override
+    public Filter getFilter() {
+        return filter;
     }
 
     @Override
@@ -63,4 +72,28 @@ static class ViewHolder extends RecyclerView.ViewHolder {
             remove = view.findViewById(R.id.item_remove);
         }
     }
+
+    private class SearchFilter extends Filter {
+        private ArrayList<String> items_backup = paths;
+        private ArrayList<String> filteredItems = new ArrayList<>();
+
+        @Override
+        protected Filter.FilterResults performFiltering(CharSequence p1) {
+            filteredItems.clear();
+
+            for (int x = 0; x < items_backup.size(); x++) {
+                String query = p1.toString().toLowerCase();
+                if (items_backup.get(x).toLowerCase().contains((query))) {
+                    filteredItems.add(items_backup.get(x));
+                }
+            }
+            return null;
+        }
+
+        @Override
+        protected void publishResults(CharSequence p1, Filter.FilterResults p2) {
+            paths = filteredItems;
+            notifyDataSetChanged();
+        }
+    }
 }

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

@@ -3,6 +3,7 @@
 import android.content.Context;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.util.Log;
 
 public final class Database extends SQLiteOpenHelper {
 
@@ -24,6 +25,6 @@ public void onCreate(SQLiteDatabase db) {
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-
+        Log.e("onUpgrade", ": " + db + ": " + oldVersion + ": " + newVersion);
     }
 }