Full isolate texel core!!

GabrielBRDeveloper · Jul 18, 2024 · e7be4a8 · e7be4a8
1 parent 6c9badd
commit e7be4a8
Show file tree

Hide file tree

Showing 10 changed files with 52 additions and 35 deletions.
diff --git a/src/br/nullexcept/mux/app/Activity.java b/src/br/nullexcept/mux/app/Activity.java
@@ -1,6 +1,5 @@
 package br.nullexcept.mux.app;
 
-import br.nullexcept.mux.core.texel.TexelAPI;
 import br.nullexcept.mux.res.AttributeList;
 import br.nullexcept.mux.view.View;
 import br.nullexcept.mux.view.Window;
@@ -84,7 +83,7 @@ public  <T extends Activity> void startActivity(Launch<T> launch) {
             Activity nw = launch.make();
             nw._args = launch;
             nw.stack = new ActivityStack(nw);
-            Application.boot(TexelAPI.createWindow(), nw);
+            Application.boot(Application.getProject().getCoreBootstrap().makeWindow(), nw);
         }
     }
 

diff --git a/src/br/nullexcept/mux/app/Application.java b/src/br/nullexcept/mux/app/Application.java
@@ -1,6 +1,5 @@
 package br.nullexcept.mux.app;
 
-import br.nullexcept.mux.core.texel.TexelAPI;
 import br.nullexcept.mux.view.Window;
 
 import java.io.File;
@@ -14,10 +13,12 @@ public class Application {
     private static final ArrayList<ActivityStack> activities = new ArrayList<>();
     private static Project current;
 
-    public static void initialize(Project project){
-        initialize(project, new TexelAPI());
+    public static Project getProject() {
+        return current;
     }
-    public static void initialize(Project project, CoreBoostrap boostrap){
+
+    public static void initialize(Project project){
+        CoreBoostrap boostrap = project.getCoreBootstrap();;
         Application.current = project;
         Looper loop = new Looper();
         Looper.mainLooper = loop;

diff --git a/src/br/nullexcept/mux/app/Context.java b/src/br/nullexcept/mux/app/Context.java
@@ -1,6 +1,5 @@
 package br.nullexcept.mux.app;
 
-import br.nullexcept.mux.core.texel.TexelAPI;
 import br.nullexcept.mux.lang.Parcel;
 import br.nullexcept.mux.res.AssetsManager;
 import br.nullexcept.mux.res.LayoutInflater;
@@ -18,7 +17,7 @@ public class Context {
 
     public Context(){
         mResource = new Resources(this);
-        applets.putAll(TexelAPI.obtainApplets());
+        applets.putAll(Application.getProject().getCoreBootstrap().getSystemApplets());
     }
 
     public File getFilesDir() {

diff --git a/src/br/nullexcept/mux/app/CoreBoostrap.java b/src/br/nullexcept/mux/app/CoreBoostrap.java
@@ -2,8 +2,11 @@
 
 import br.nullexcept.mux.view.Window;
 
+import java.util.Map;
+
 public interface CoreBoostrap {
     void boot();
     void finish();
     Window makeWindow();
+    Map<? extends String,? extends Applet> getSystemApplets();
 }
diff --git a/src/br/nullexcept/mux/app/Project.java b/src/br/nullexcept/mux/app/Project.java
@@ -4,27 +4,5 @@ public interface Project {
     String getPackage();
     Launch<Activity> getLaunch();
 
-    static <T extends Activity> Project build(Launch<T> init, String package_) {
-        return new SimpleProject(package_, init);
-    }
-}
-
-class SimpleProject  <T extends Activity> implements Project {
-    private final String package_;
-    private final Launch<T> initial;
-
-    SimpleProject(String package_, Launch<T> initial) {
-        this.package_ = package_;
-        this.initial = initial;
-    }
-
-    @Override
-    public String getPackage() {
-        return package_;
-    }
-
-    @Override
-    public Launch<Activity> getLaunch() {
-        return (Launch<Activity>) initial;
-    }
+    CoreBoostrap getCoreBootstrap();
 }
diff --git a/src/br/nullexcept/mux/core/texel/TexelAPI.java b/src/br/nullexcept/mux/core/texel/TexelAPI.java
@@ -18,7 +18,7 @@
 import static org.lwjgl.glfw.GLFW.*;
 import static org.lwjgl.glfw.GLFW.glfwSwapInterval;
 
-public class TexelAPI implements CoreBoostrap {
+class TexelAPI implements CoreBoostrap {
     static final HashMap<String, Applet> applets = new HashMap<>();
     private static final HashMap<PointerIcon.Model, Long> pointers = new HashMap<>();
 
@@ -96,4 +96,9 @@ public void finish() {
     public Window makeWindow() {
         return createWindow();
     }
+
+    @Override
+    public Map<? extends String, ? extends Applet> getSystemApplets() {
+        return TexelAPI.obtainApplets();
+    }
 }
diff --git a/src/br/nullexcept/mux/core/texel/TexelFontFactory.java b/src/br/nullexcept/mux/core/texel/TexelFontFactory.java
@@ -7,7 +7,7 @@
 
 import java.io.InputStream;
 
-public class TexelFontFactory extends TypefaceFactory {
+class TexelFontFactory extends TypefaceFactory {
 
     public TexelFontFactory() {
         Typeface.DEFAULT = decodeTypeface(TexelFontFactory.class.getResourceAsStream("/res/fonts/Roboto/Roboto-Regular.ttf"));

diff --git a/src/br/nullexcept/mux/core/texel/TexelFontMetrics.java b/src/br/nullexcept/mux/core/texel/TexelFontMetrics.java
@@ -3,7 +3,7 @@
 import br.nullexcept.mux.graphics.Paint;
 import br.nullexcept.mux.graphics.fonts.FontMetrics;
 
-public class TexelFontMetrics extends FontMetrics  {
+class TexelFontMetrics extends FontMetrics  {
     private final Paint paint;
 
     protected TexelFontMetrics(Paint paint){

diff --git a/src/br/nullexcept/mux/core/texel/TexelProject.java b/src/br/nullexcept/mux/core/texel/TexelProject.java
@@ -0,0 +1,31 @@
+package br.nullexcept.mux.core.texel;
+
+import br.nullexcept.mux.app.Activity;
+import br.nullexcept.mux.app.CoreBoostrap;
+import br.nullexcept.mux.app.Launch;
+import br.nullexcept.mux.app.Project;
+
+public class TexelProject implements Project {
+    private final String package_;
+    private final Launch<Activity> initial;
+
+    public <T extends Activity> TexelProject(String package_, Launch<T> initial) {
+        this.package_ = package_;
+        this.initial = (Launch<Activity>) initial;
+    }
+
+    @Override
+    public String getPackage() {
+        return package_;
+    }
+
+    @Override
+    public Launch<Activity> getLaunch() {
+        return initial;
+    }
+
+    @Override
+    public CoreBoostrap getCoreBootstrap() {
+        return new TexelAPI();
+    }
+}
diff --git a/src/br/nullexcept/mux/test/Example.java b/src/br/nullexcept/mux/test/Example.java
@@ -4,14 +4,15 @@
 import br.nullexcept.mux.app.Application;
 import br.nullexcept.mux.app.Launch;
 import br.nullexcept.mux.app.Project;
+import br.nullexcept.mux.core.texel.TexelProject;
 import br.nullexcept.mux.lang.Promise;
 import br.nullexcept.mux.utils.Log;
 import br.nullexcept.mux.view.View;
 
 public class Example extends Activity {
     private static int layer = 0;
     public static void main(String[] args) {
-        Application.initialize(Project.build(new Launch<>(Example.class), "br.nullexcept.test-master-ui"));
+        Application.initialize(new TexelProject("br.nullexcept.test-master-ui",new Launch<>(Example.class)));
     }
     private View animate;
     int x = 0;