From 07b61818a9627c5196ba73ba461c82e4fd241208 Mon Sep 17 00:00:00 2001 From: Gabriel Machado <97042217+GabrielBRDeveloper@users.noreply.github.com> Date: Sat, 20 Jul 2024 23:31:05 -0400 Subject: [PATCH] Reorganize Project Structure (#8) * separate core and engine * Recreate MANIFEST.MF * Remove some resiliente files * Fix github build --- .github/build.sh | 10 +- .github/workflows/build-linux.yml | 9 +- .idea/artifacts/MasterUI_jar.xml | 17 - .idea/artifacts/core_jar.xml | 10 + .idea/artifacts/texel_jar.xml | 18 + .idea/libraries/lib.xml | 12 - .idea/libraries/texel_libs.xml | 12 + .idea/modules.xml | 3 +- MasterUI.iml | 1 - build.properties | 3 + build.xml | 284 ++++++++---- {assets => core/assets}/README.txt | 0 core/core.iml | 13 + .../res}/drawable/button_background.xml | 0 .../res}/drawable/default_window_icon.xml | 0 .../res}/drawable/menu_background.xml | 0 .../res}/drawable/menu_item_background.xml | 0 .../res}/drawable/scrollbar_thumb.xml | 0 .../res}/drawable/switch_background.xml | 0 {res => core/res}/drawable/test_path.xml | 0 .../res}/drawable/textarea_background.xml | 0 core/res/ex-layout/main.xml | 61 +++ {res => core/res}/font/roboto.xml | 0 {res => core/res}/fonts/MaterialIcons/LICENSE | 0 .../MaterialIcons/MaterialIcons-Regular.ttf | Bin .../res}/fonts/MaterialIcons/icons.codepoints | 0 {res => core/res}/fonts/Roboto/LICENSE.txt | 404 +++++++++--------- .../res}/fonts/Roboto/Roboto-Bold.ttf | Bin .../res}/fonts/Roboto/Roboto-BoldItalic.ttf | Bin .../res}/fonts/Roboto/Roboto-Italic.ttf | Bin .../res}/fonts/Roboto/Roboto-Regular.ttf | Bin .../res}/layout/default_widget_menu_item.xml | 0 {res => core/res}/layout/example_list.xml | 0 {res => core/res}/layout/text.xml | 0 {res => core/res}/style/defaults.xml | 0 core/src/META-INF/MANIFEST.MF | 3 + .../native-image/resource-config.json | 0 {src => core/src}/br/nullexcept/mux/C.java | 0 .../src}/br/nullexcept/mux/app/Activity.java | 0 .../br/nullexcept/mux/app/ActivityStack.java | 0 .../src}/br/nullexcept/mux/app/Applet.java | 0 .../br/nullexcept/mux/app/Application.java | 0 .../src}/br/nullexcept/mux/app/Context.java | 0 .../br/nullexcept/mux/app/CoreBoostrap.java | 0 .../src}/br/nullexcept/mux/app/Launch.java | 0 .../src}/br/nullexcept/mux/app/Looper.java | 0 .../src}/br/nullexcept/mux/app/Project.java | 0 .../src}/br/nullexcept/mux/app/Service.java | 0 .../br/nullexcept/mux/app/WindowState.java | 0 .../mux/app/applets/ClipboardApplet.java | 0 .../mux/app/applets/DisplayApplet.java | 0 .../br/nullexcept/mux/graphics/Bitmap.java | 0 .../mux/graphics/BitmapFactory.java | 0 .../br/nullexcept/mux/graphics/Canvas.java | 0 .../br/nullexcept/mux/graphics/Color.java | 0 .../mux/graphics/ColorStateList.java | 0 .../br/nullexcept/mux/graphics/Drawable.java | 0 .../br/nullexcept/mux/graphics/Paint.java | 0 .../src}/br/nullexcept/mux/graphics/Path.java | 0 .../br/nullexcept/mux/graphics/Point.java | 0 .../br/nullexcept/mux/graphics/PointF.java | 0 .../src}/br/nullexcept/mux/graphics/Rect.java | 0 .../src}/br/nullexcept/mux/graphics/Size.java | 0 .../br/nullexcept/mux/graphics/StateList.java | 0 .../mux/graphics/drawable/BitmapDrawable.java | 0 .../mux/graphics/drawable/ColorDrawable.java | 0 .../graphics/drawable/LayerListDrawable.java | 0 .../drawable/MaterialIconDrawable.java | 0 .../graphics/drawable/NinePathDrawable.java | 0 .../mux/graphics/drawable/PathDrawable.java | 0 .../graphics/drawable/SelectorDrawable.java | 0 .../mux/graphics/drawable/ShapeDrawable.java | 0 .../mux/graphics/fonts/FontMetrics.java | 0 .../mux/graphics/fonts/Typeface.java | 0 .../mux/graphics/fonts/TypefaceFactory.java | 0 .../mux/graphics/shape/OvalShape.java | 0 .../mux/graphics/shape/RectShape.java | 0 .../mux/graphics/shape/RoundedShape.java | 0 .../nullexcept/mux/graphics/shape/Shape.java | 0 .../mux/graphics/shape/ShapeList.java | 0 .../br/nullexcept/mux/input/CharEvent.java | 0 .../src}/br/nullexcept/mux/input/Event.java | 0 .../br/nullexcept/mux/input/InputDevice.java | 0 .../br/nullexcept/mux/input/InputEvent.java | 0 .../br/nullexcept/mux/input/InputSource.java | 0 .../br/nullexcept/mux/input/KeyEvent.java | 0 .../br/nullexcept/mux/input/MotionEvent.java | 0 .../br/nullexcept/mux/input/MouseEvent.java | 0 .../src}/br/nullexcept/mux/lang/Bindable.java | 0 .../br/nullexcept/mux/lang/Disposable.java | 0 .../src}/br/nullexcept/mux/lang/Function.java | 0 .../br/nullexcept/mux/lang/Function2.java | 0 .../src}/br/nullexcept/mux/lang/Parcel.java | 0 .../src}/br/nullexcept/mux/lang/Promise.java | 0 .../src}/br/nullexcept/mux/lang/Task.java | 0 .../src}/br/nullexcept/mux/lang/Valuable.java | 0 .../nullexcept/mux/lang/ValuedFunction.java | 0 .../nullexcept/mux/lang/xml/XmlElement.java | 0 .../br/nullexcept/mux/res/AssetsManager.java | 0 .../br/nullexcept/mux/res/AttributeList.java | 0 .../mux/res/DisplayInformation.java | 0 .../mux/res/FallbackAttributes.java | 0 .../nullexcept/mux/res/FallbackLanguage.java | 0 .../br/nullexcept/mux/res/LayoutInflater.java | 0 .../br/nullexcept/mux/res/MenuInflater.java | 0 .../src}/br/nullexcept/mux/res/Parser.java | 13 +- .../br/nullexcept/mux/res/ResourceCache.java | 0 .../src}/br/nullexcept/mux/res/Resources.java | 2 - .../br/nullexcept/mux/res/StylePreset.java | 0 .../src}/br/nullexcept/mux/text/Editable.java | 0 .../mux/text/OnTextChangedListener.java | 0 .../br/nullexcept/mux/text/Selection.java | 0 .../br/nullexcept/mux/text/TextLayout.java | 0 .../br/nullexcept/mux/utils/BufferUtils.java | 0 .../nullexcept/mux/utils/LinearAnimation.java | 0 .../src}/br/nullexcept/mux/utils/Log.java | 0 .../src}/br/nullexcept/mux/view/AttrList.java | 0 .../src}/br/nullexcept/mux/view/Gravity.java | 0 .../mux/view/MarginLayoutParams.java | 0 .../br/nullexcept/mux/view/PointerIcon.java | 0 .../src}/br/nullexcept/mux/view/View.java | 0 .../br/nullexcept/mux/view/ViewGroup.java | 0 .../src}/br/nullexcept/mux/view/ViewRoot.java | 0 .../src}/br/nullexcept/mux/view/Window.java | 0 .../mux/view/anim/AlphaAnimation.java | 0 .../mux/view/anim/AnimationCallback.java | 0 .../mux/view/anim/RotationAnimation.java | 0 .../mux/view/anim/TransitionAttr.java | 0 .../mux/view/anim/ViewTransition.java | 0 .../nullexcept/mux/view/menu/MenuGroup.java | 0 .../br/nullexcept/mux/view/menu/MenuItem.java | 0 .../nullexcept/mux/widget/AbsoluteLayout.java | 0 .../src}/br/nullexcept/mux/widget/Button.java | 0 .../br/nullexcept/mux/widget/CardLayout.java | 0 .../br/nullexcept/mux/widget/EditText.java | 0 .../br/nullexcept/mux/widget/FrameLayout.java | 0 .../mux/widget/HardwareSurface.java | 0 .../br/nullexcept/mux/widget/ImageView.java | 0 .../nullexcept/mux/widget/LinearLayout.java | 0 .../br/nullexcept/mux/widget/ScrollView.java | 0 .../src}/br/nullexcept/mux/widget/Switch.java | 0 .../br/nullexcept/mux/widget/TextView.java | 0 res/ex-layout/main.xml | 60 --- src/META-INF/MANIFEST.MF | 2 - {lib => texel/libs}/lwjgl-egl.jar | Bin {lib => texel/libs}/lwjgl-glfw.jar | Bin {lib => texel/libs}/lwjgl-nanovg.jar | Bin {lib => texel/libs}/lwjgl-opengles.jar | Bin {lib => texel/libs}/lwjgl.jar | Bin .../natives/lwjgl-glfw-natives-linux.jar | Bin .../natives/lwjgl-nanovg-natives-linux.jar | Bin .../libs}/natives/lwjgl-natives-linux.jar | Bin .../natives/lwjgl-opengles-natives-linux.jar | Bin {res => texel/res}/raw/view_renderer.frag | 0 {res => texel/res}/raw/view_renderer.vert | 0 .../nullexcept/mux/core}/hardware/GLES.java | 0 .../br/nullexcept/mux/core}/test/Example.java | 13 +- .../mux/core/texel/CanvasTexel.java | 0 .../mux/core/texel/GLFramebuffer.java | 0 .../nullexcept/mux/core/texel/GLProgram.java | 0 .../mux/core/texel/GLProgramTexture.java | 0 .../mux/core/texel/GLProgramView.java | 0 .../mux/core/texel/GLShaderList.java | 0 .../br/nullexcept/mux/core/texel/GLTexel.java | 0 .../nullexcept/mux/core/texel/GLTexture.java | 0 .../nullexcept/mux/core/texel/GlesUtils.java | 0 .../mux/core/texel/GlfwApplets.java | 0 .../mux/core/texel/GlfwEventManager.java | 0 .../nullexcept/mux/core/texel/GlfwWindow.java | 0 .../nullexcept/mux/core/texel/MenuLayout.java | 0 .../mux/core/texel/RenderCache.java | 0 .../nullexcept/mux/core/texel/TexelAPI.java | 0 .../mux/core/texel/TexelBitmap.java | 0 .../mux/core/texel/TexelBitmapFactory.java | 0 .../nullexcept/mux/core/texel/TexelFont.java | 0 .../mux/core/texel/TexelFontFactory.java | 0 .../mux/core/texel/TexelFontMetrics.java | 0 .../mux/core/texel/TexelProject.java | 0 .../br/nullexcept/mux/core/texel/VgTexel.java | 0 .../mux/core/texel/ViewRenderer.java | 0 .../mux/core/texel/WindowContainer.java | 0 .../src}/org/lwjgl/nanovg/NanoVGGLConfig.java | 0 texel/texel.iml | 15 + 183 files changed, 567 insertions(+), 398 deletions(-) delete mode 100644 .idea/artifacts/MasterUI_jar.xml create mode 100644 .idea/artifacts/core_jar.xml create mode 100644 .idea/artifacts/texel_jar.xml delete mode 100644 .idea/libraries/lib.xml create mode 100644 .idea/libraries/texel_libs.xml rename {assets => core/assets}/README.txt (100%) create mode 100644 core/core.iml rename {res => core/res}/drawable/button_background.xml (100%) rename {res => core/res}/drawable/default_window_icon.xml (100%) rename {res => core/res}/drawable/menu_background.xml (100%) rename {res => core/res}/drawable/menu_item_background.xml (100%) rename {res => core/res}/drawable/scrollbar_thumb.xml (100%) rename {res => core/res}/drawable/switch_background.xml (100%) rename {res => core/res}/drawable/test_path.xml (100%) rename {res => core/res}/drawable/textarea_background.xml (100%) create mode 100644 core/res/ex-layout/main.xml rename {res => core/res}/font/roboto.xml (100%) rename {res => core/res}/fonts/MaterialIcons/LICENSE (100%) rename {res => core/res}/fonts/MaterialIcons/MaterialIcons-Regular.ttf (100%) rename {res => core/res}/fonts/MaterialIcons/icons.codepoints (100%) rename {res => core/res}/fonts/Roboto/LICENSE.txt (98%) rename {res => core/res}/fonts/Roboto/Roboto-Bold.ttf (100%) rename {res => core/res}/fonts/Roboto/Roboto-BoldItalic.ttf (100%) rename {res => core/res}/fonts/Roboto/Roboto-Italic.ttf (100%) rename {res => core/res}/fonts/Roboto/Roboto-Regular.ttf (100%) rename {res => core/res}/layout/default_widget_menu_item.xml (100%) rename {res => core/res}/layout/example_list.xml (100%) rename {res => core/res}/layout/text.xml (100%) rename {res => core/res}/style/defaults.xml (100%) create mode 100644 core/src/META-INF/MANIFEST.MF rename {src => core/src}/META-INF/native-image/resource-config.json (100%) rename {src => core/src}/br/nullexcept/mux/C.java (100%) rename {src => core/src}/br/nullexcept/mux/app/Activity.java (100%) rename {src => core/src}/br/nullexcept/mux/app/ActivityStack.java (100%) rename {src => core/src}/br/nullexcept/mux/app/Applet.java (100%) rename {src => core/src}/br/nullexcept/mux/app/Application.java (100%) rename {src => core/src}/br/nullexcept/mux/app/Context.java (100%) rename {src => core/src}/br/nullexcept/mux/app/CoreBoostrap.java (100%) rename {src => core/src}/br/nullexcept/mux/app/Launch.java (100%) rename {src => core/src}/br/nullexcept/mux/app/Looper.java (100%) rename {src => core/src}/br/nullexcept/mux/app/Project.java (100%) rename {src => core/src}/br/nullexcept/mux/app/Service.java (100%) rename {src => core/src}/br/nullexcept/mux/app/WindowState.java (100%) rename {src => core/src}/br/nullexcept/mux/app/applets/ClipboardApplet.java (100%) rename {src => core/src}/br/nullexcept/mux/app/applets/DisplayApplet.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Bitmap.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/BitmapFactory.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Canvas.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Color.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/ColorStateList.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Drawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Paint.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Path.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Point.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/PointF.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Rect.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/Size.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/StateList.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/drawable/BitmapDrawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/drawable/ColorDrawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/drawable/LayerListDrawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/drawable/MaterialIconDrawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/drawable/NinePathDrawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/drawable/PathDrawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/drawable/SelectorDrawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/drawable/ShapeDrawable.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/fonts/FontMetrics.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/fonts/Typeface.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/fonts/TypefaceFactory.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/shape/OvalShape.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/shape/RectShape.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/shape/RoundedShape.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/shape/Shape.java (100%) rename {src => core/src}/br/nullexcept/mux/graphics/shape/ShapeList.java (100%) rename {src => core/src}/br/nullexcept/mux/input/CharEvent.java (100%) rename {src => core/src}/br/nullexcept/mux/input/Event.java (100%) rename {src => core/src}/br/nullexcept/mux/input/InputDevice.java (100%) rename {src => core/src}/br/nullexcept/mux/input/InputEvent.java (100%) rename {src => core/src}/br/nullexcept/mux/input/InputSource.java (100%) rename {src => core/src}/br/nullexcept/mux/input/KeyEvent.java (100%) rename {src => core/src}/br/nullexcept/mux/input/MotionEvent.java (100%) rename {src => core/src}/br/nullexcept/mux/input/MouseEvent.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/Bindable.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/Disposable.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/Function.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/Function2.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/Parcel.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/Promise.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/Task.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/Valuable.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/ValuedFunction.java (100%) rename {src => core/src}/br/nullexcept/mux/lang/xml/XmlElement.java (100%) rename {src => core/src}/br/nullexcept/mux/res/AssetsManager.java (100%) rename {src => core/src}/br/nullexcept/mux/res/AttributeList.java (100%) rename {src => core/src}/br/nullexcept/mux/res/DisplayInformation.java (100%) rename {src => core/src}/br/nullexcept/mux/res/FallbackAttributes.java (100%) rename {src => core/src}/br/nullexcept/mux/res/FallbackLanguage.java (100%) rename {src => core/src}/br/nullexcept/mux/res/LayoutInflater.java (100%) rename {src => core/src}/br/nullexcept/mux/res/MenuInflater.java (100%) rename {src => core/src}/br/nullexcept/mux/res/Parser.java (97%) rename {src => core/src}/br/nullexcept/mux/res/ResourceCache.java (100%) rename {src => core/src}/br/nullexcept/mux/res/Resources.java (99%) rename {src => core/src}/br/nullexcept/mux/res/StylePreset.java (100%) rename {src => core/src}/br/nullexcept/mux/text/Editable.java (100%) rename {src => core/src}/br/nullexcept/mux/text/OnTextChangedListener.java (100%) rename {src => core/src}/br/nullexcept/mux/text/Selection.java (100%) rename {src => core/src}/br/nullexcept/mux/text/TextLayout.java (100%) rename {src => core/src}/br/nullexcept/mux/utils/BufferUtils.java (100%) rename {src => core/src}/br/nullexcept/mux/utils/LinearAnimation.java (100%) rename {src => core/src}/br/nullexcept/mux/utils/Log.java (100%) rename {src => core/src}/br/nullexcept/mux/view/AttrList.java (100%) rename {src => core/src}/br/nullexcept/mux/view/Gravity.java (100%) rename {src => core/src}/br/nullexcept/mux/view/MarginLayoutParams.java (100%) rename {src => core/src}/br/nullexcept/mux/view/PointerIcon.java (100%) rename {src => core/src}/br/nullexcept/mux/view/View.java (100%) rename {src => core/src}/br/nullexcept/mux/view/ViewGroup.java (100%) rename {src => core/src}/br/nullexcept/mux/view/ViewRoot.java (100%) rename {src => core/src}/br/nullexcept/mux/view/Window.java (100%) rename {src => core/src}/br/nullexcept/mux/view/anim/AlphaAnimation.java (100%) rename {src => core/src}/br/nullexcept/mux/view/anim/AnimationCallback.java (100%) rename {src => core/src}/br/nullexcept/mux/view/anim/RotationAnimation.java (100%) rename {src => core/src}/br/nullexcept/mux/view/anim/TransitionAttr.java (100%) rename {src => core/src}/br/nullexcept/mux/view/anim/ViewTransition.java (100%) rename {src => core/src}/br/nullexcept/mux/view/menu/MenuGroup.java (100%) rename {src => core/src}/br/nullexcept/mux/view/menu/MenuItem.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/AbsoluteLayout.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/Button.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/CardLayout.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/EditText.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/FrameLayout.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/HardwareSurface.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/ImageView.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/LinearLayout.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/ScrollView.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/Switch.java (100%) rename {src => core/src}/br/nullexcept/mux/widget/TextView.java (100%) delete mode 100644 res/ex-layout/main.xml delete mode 100644 src/META-INF/MANIFEST.MF rename {lib => texel/libs}/lwjgl-egl.jar (100%) rename {lib => texel/libs}/lwjgl-glfw.jar (100%) rename {lib => texel/libs}/lwjgl-nanovg.jar (100%) rename {lib => texel/libs}/lwjgl-opengles.jar (100%) rename {lib => texel/libs}/lwjgl.jar (100%) rename {lib => texel/libs}/natives/lwjgl-glfw-natives-linux.jar (100%) rename {lib => texel/libs}/natives/lwjgl-nanovg-natives-linux.jar (100%) rename {lib => texel/libs}/natives/lwjgl-natives-linux.jar (100%) rename {lib => texel/libs}/natives/lwjgl-opengles-natives-linux.jar (100%) rename {res => texel/res}/raw/view_renderer.frag (100%) rename {res => texel/res}/raw/view_renderer.vert (100%) rename {src/br/nullexcept/mux => texel/src/br/nullexcept/mux/core}/hardware/GLES.java (100%) rename {src/br/nullexcept/mux => texel/src/br/nullexcept/mux/core}/test/Example.java (63%) rename {src => texel/src}/br/nullexcept/mux/core/texel/CanvasTexel.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GLFramebuffer.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GLProgram.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GLProgramTexture.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GLProgramView.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GLShaderList.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GLTexel.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GLTexture.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GlesUtils.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GlfwApplets.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GlfwEventManager.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/GlfwWindow.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/MenuLayout.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/RenderCache.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/TexelAPI.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/TexelBitmap.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/TexelBitmapFactory.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/TexelFont.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/TexelFontFactory.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/TexelFontMetrics.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/TexelProject.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/VgTexel.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/ViewRenderer.java (100%) rename {src => texel/src}/br/nullexcept/mux/core/texel/WindowContainer.java (100%) rename {src => texel/src}/org/lwjgl/nanovg/NanoVGGLConfig.java (100%) create mode 100644 texel/texel.iml diff --git a/.github/build.sh b/.github/build.sh index 4c3a2a6..fa2b3cd 100644 --- a/.github/build.sh +++ b/.github/build.sh @@ -1,12 +1,12 @@ #!/bin/bash echo "Deleting redundant files" -rm -r res/layout/example_list.xml -rm -r res/layout/main.xml -rm -r res/layout/text.xml +rm -r core/res/layout/example_list.xml +rm -r core/res/layout/main.xml +rm -r core/res/layout/text.xml -rm -r src/br/nullexcept/mux/test -rm src/META-INF/MANIFEST.MF +rm -r texel/src/br/nullexcept/mux/test +rm core/src/META-INF/MANIFEST.MF echo "Building..." diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 3110c05..272899f 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -21,8 +21,13 @@ jobs: run: chmod +x .github/build.sh - name: Build project run: .github/build.sh + - name: Upload Core + uses: actions/upload-artifact@v4 + with: + name: MasterUI ( Core ) + path: ./out/artifacts/core/core.jar - name: Upload uses: actions/upload-artifact@v4 with: - name: MasterUI-Linux - path: ./out/artifacts/MasterUI/MasterUI.jar + name: MasterUI ( Texel ) + path: ./out/artifacts/texel/texel.jar diff --git a/.idea/artifacts/MasterUI_jar.xml b/.idea/artifacts/MasterUI_jar.xml deleted file mode 100644 index 2315fc8..0000000 --- a/.idea/artifacts/MasterUI_jar.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - $PROJECT_DIR$/out/artifacts/MasterUI-Demo - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/artifacts/core_jar.xml b/.idea/artifacts/core_jar.xml new file mode 100644 index 0000000..1b29aa5 --- /dev/null +++ b/.idea/artifacts/core_jar.xml @@ -0,0 +1,10 @@ + + + $PROJECT_DIR$/out/artifacts/core_jar + + + + + + + \ No newline at end of file diff --git a/.idea/artifacts/texel_jar.xml b/.idea/artifacts/texel_jar.xml new file mode 100644 index 0000000..e857764 --- /dev/null +++ b/.idea/artifacts/texel_jar.xml @@ -0,0 +1,18 @@ + + + $PROJECT_DIR$/out/artifacts/texel_jar + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/lib.xml b/.idea/libraries/lib.xml deleted file mode 100644 index dabe520..0000000 --- a/.idea/libraries/lib.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/texel_libs.xml b/.idea/libraries/texel_libs.xml new file mode 100644 index 0000000..9c9725a --- /dev/null +++ b/.idea/libraries/texel_libs.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 7150b86..1695394 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,8 @@ - + + \ No newline at end of file diff --git a/MasterUI.iml b/MasterUI.iml index 26b2bb5..f75a8a9 100644 --- a/MasterUI.iml +++ b/MasterUI.iml @@ -13,6 +13,5 @@ - \ No newline at end of file diff --git a/build.properties b/build.properties index e69de29..d58fdf6 100644 --- a/build.properties +++ b/build.properties @@ -0,0 +1,3 @@ +path.variable.kotlin_bundled=/home/gabriel/Programas/IntellJ/plugins/Kotlin/kotlinc +path.variable.maven_repository=/home/gabriel/.m2/repository +jdk.home.1.8=/usr/lib/jvm/java-8-openjdk-amd64 \ No newline at end of file diff --git a/build.xml b/build.xml index 592f8b2..5d26b9f 100644 --- a/build.xml +++ b/build.xml @@ -25,8 +25,6 @@ - - @@ -34,13 +32,13 @@ + - @@ -55,14 +53,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + @@ -70,135 +98,247 @@ - + - + + + + - + - - + + - + - - + + - - - + + - - - + + + - - - - + + + - + - - + + - - + + - + - + - - - - - - - - + + + + + + + + - - + + - - + + - - + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + + - + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - - - - + + + + diff --git a/assets/README.txt b/core/assets/README.txt similarity index 100% rename from assets/README.txt rename to core/assets/README.txt diff --git a/core/core.iml b/core/core.iml new file mode 100644 index 0000000..3eafd18 --- /dev/null +++ b/core/core.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/res/drawable/button_background.xml b/core/res/drawable/button_background.xml similarity index 100% rename from res/drawable/button_background.xml rename to core/res/drawable/button_background.xml diff --git a/res/drawable/default_window_icon.xml b/core/res/drawable/default_window_icon.xml similarity index 100% rename from res/drawable/default_window_icon.xml rename to core/res/drawable/default_window_icon.xml diff --git a/res/drawable/menu_background.xml b/core/res/drawable/menu_background.xml similarity index 100% rename from res/drawable/menu_background.xml rename to core/res/drawable/menu_background.xml diff --git a/res/drawable/menu_item_background.xml b/core/res/drawable/menu_item_background.xml similarity index 100% rename from res/drawable/menu_item_background.xml rename to core/res/drawable/menu_item_background.xml diff --git a/res/drawable/scrollbar_thumb.xml b/core/res/drawable/scrollbar_thumb.xml similarity index 100% rename from res/drawable/scrollbar_thumb.xml rename to core/res/drawable/scrollbar_thumb.xml diff --git a/res/drawable/switch_background.xml b/core/res/drawable/switch_background.xml similarity index 100% rename from res/drawable/switch_background.xml rename to core/res/drawable/switch_background.xml diff --git a/res/drawable/test_path.xml b/core/res/drawable/test_path.xml similarity index 100% rename from res/drawable/test_path.xml rename to core/res/drawable/test_path.xml diff --git a/res/drawable/textarea_background.xml b/core/res/drawable/textarea_background.xml similarity index 100% rename from res/drawable/textarea_background.xml rename to core/res/drawable/textarea_background.xml diff --git a/core/res/ex-layout/main.xml b/core/res/ex-layout/main.xml new file mode 100644 index 0000000..2e38ea4 --- /dev/null +++ b/core/res/ex-layout/main.xml @@ -0,0 +1,61 @@ + + + + + +