Merge pull request #10 from jkas-dbt/dev

Code optimizations for LayoutEditor

Author: jkasdbt

app/proguard-rules.pro

@@ -26,6 +26,8 @@
 -dontwarn java.beans.Introspector
 -dontwarn java.beans.PropertyDescriptor
 
+-dontwarn javax.annotation.ParametersAreNonnullByDefault
+
 -dontwarn androidx.appcompat.graphics.drawable.DrawableWrapper
 -dontwarn androidx.databinding.DataBinderMapperImpl
 -dontwarn androidx.databinding.DataBindingComponent

app/src/main/java/jkas/androidpe/activities/MainActivity.java

@@ -30,7 +30,7 @@
 import jkas.androidpe.resources.R;
 import jkas.androidpe.explorer.SelectFF;
 import jkas.androidpe.project.Project;
-import jkas.androidpe.projectAnalyzer.SearchingProjects;
+import jkas.androidpe.projectAnalyzer.ProjectLoader;
 import jkas.androidpe.resourcesUtils.dataInitializer.DataRefManager;
 import jkas.androidpe.resourcesUtils.utils.ResourcesValuesFixer;
 import jkas.codeUtil.CodeUtil;
@@ -47,7 +47,7 @@ public class MainActivity extends AppCompatActivity {
     private NewProject newProject;
     private AppCompatActivity C = this;
     private ActivityMainBinding binding;
-    private SearchingProjects SP;
+    private ProjectLoader projectLoader;
     private ActivityResultLauncher<String> requestPermissionLauncher =
             registerForActivityResult(
                     new ActivityResultContracts.RequestPermission(),
@@ -134,7 +134,7 @@ private void loadProjectView() {
         }
         binding.tvStatusPermission.setText("GRANTED");
         binding.gridLayoutListProjects.removeAllViews();
-        SP.load();
+        projectLoader.load();
     }
 
     private boolean checkIfPermissionGranted() {
@@ -221,7 +221,7 @@ private void openProject(String data) {
 
         final Project p = new Project(p2p, folderName);
         p.setPackageName("...");
-        p.setPackageName(SearchingProjects.tryFindPkg(p));
+        p.setPackageName(ProjectLoader.tryFindPkg(p));
         new ProjectView(C, p);
         DataRefManager.getInstance().P = p;
         CodeUtil.startActivity(C, ProjectEditorActivity.class);
@@ -235,8 +235,8 @@ private void loadListeners() {
                     openProject(path);
                     loadProjectView();
                 });
-        SP.setOnProjectFound(
-                new SearchingProjects.OnProjectFoundListener() {
+        projectLoader.setOnProjectFound(
+                new ProjectLoader.OnProjectFoundListener() {
                     private boolean found = false;
 
                     @Override
@@ -286,7 +286,7 @@ private void viewGradientBottom() {
     }
 
     private void initInstances() {
-        SP = new SearchingProjects(C);
+        projectLoader = new ProjectLoader(C);
         newProject = new NewProject(C);
 
         if (CodeUtil.isScreenLandscape(this)) {

app/src/main/java/jkas/androidpe/preferences/AboutCategory.java

@@ -50,7 +50,7 @@ private void addData() {
                             new Intent(
                                     Intent.ACTION_VIEW,
                                     Uri.parse(
-                                            "https://github.com/jkas-dbt/AndroidPE/releases/tag/v1.6")));
+                                            "https://github.com/jkas-dbt/AndroidPE/releases/tag/v1.76")));
                     return true;
                 });
         aboutCategory.addPreference(changelog);

app/src/main/java/jkas/androidpe/projectAnalyzer/SearchingProjects.java renamed to app/src/main/java/jkas/androidpe/projectAnalyzer/ProjectLoader.java

@@ -20,14 +20,14 @@
 /**
  * @author JKas
  */
-public class SearchingProjects {
+public class ProjectLoader {
     private AppCompatActivity C;
     private OnProjectFoundListener listener;
     private ArrayList<Pair<String, String>> listPathToAllProjects = new ArrayList<>();
-    private ExecutorService exec = Executors.newSingleThreadExecutor();
+    private ExecutorService exec = Executors.newCachedThreadPool();
     private int i = 0;
 
-    public SearchingProjects(Context c) {
+    public ProjectLoader(Context c) {
         C = (AppCompatActivity) c;
     }
 

app/src/main/java/jkas/androidpe/utils/ForRes.java

@@ -12,8 +12,6 @@
  */
 public class ForRes {
     public static void initEventsResquest() {
-        
-        
         ProjectDataRequested.getInstance()
                 .setOnDataNeeded(
                         new ProjectDataRequested.OnDataNeeded() {
@@ -136,6 +134,6 @@ public Class onMaterialStyleClassNeeded() {
                             }
                         });
 
-        AttrValuesRefBase.initBase();
+        AttrValuesRefBase.initRef();
     }
 }

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

@@ -89,7 +89,7 @@
 							android:textSize="8dp"
 							android:textColor="?colorTertiary"
 							android:typeface="monospace"
-							android:text="v1.6 (181102)"
+							android:text="v1.76 (181102)"
 							android:textStyle="bold"
 							android:alpha="0.76"/>