From a40c40653526089d275b50f15a6659835135be2c Mon Sep 17 00:00:00 2001 From: DevKumar00001 <96680248+DevKumar00001@users.noreply.github.com> Date: Wed, 31 Jan 2024 15:25:09 +0530 Subject: [PATCH] Move core java file required for Blocks, Event, Web file into build/core module --- app/build.gradle | 1 + .../java/builtin/blocks/BuiltInBlocks.java | 10 ++++---- .../builtin/blocks/holder/ControlBlocks.java | 14 +++++------ .../builtin/blocks/holder/OperatorBlocks.java | 14 +++++------ .../builtin/blocks/holder/ViewBlocks.java | 10 ++++---- app/src/main/java/builtin/files/CssFile.java | 6 ++--- app/src/main/java/builtin/files/HtmlFile.java | 6 ++--- .../java/builtin/files/JavascriptFile.java | 6 ++--- .../listeners/BlocksHolderListener.java | 2 +- .../builder/listeners/EventAddListener.java | 2 +- .../listeners/FileCreationListener.java | 2 +- .../ui/activities/BlockEditorActivity.java | 4 +-- .../ui/activities/BlockManagerActivity.java | 4 +-- .../BlocksHolderManagerActivity.java | 2 +- .../ui/activities/EventEditorActivity.java | 10 ++++---- .../ui/activities/EventListActivity.java | 4 +-- .../ui/activities/FileManagerActivity.java | 2 +- .../builder/ui/adapters/BlockListAdapter.java | 6 ++--- .../ui/adapters/BlocksHolderAdapter.java | 2 +- .../BlocksHolderEventEditorListItem.java | 2 +- .../web/builder/ui/adapters/EventAdapter.java | 2 +- .../builder/ui/adapters/EventListAdapter.java | 2 +- .../ui/adapters/FileListAdapterItem.java | 2 +- .../CreateBlocksHolderDialog.java | 2 +- .../ui/dialogs/eventList/AddEventDialog.java | 4 +-- .../dialogs/filemanager/CreateFileDialog.java | 2 +- .../ui/utils/BlocksLoader/BlocksLoader.java | 4 +-- .../BlocksLoaders/ComplexBlockLoader.java | 4 +-- .../BlocksLoaders/DefaultBlockLoader.java | 2 +- .../ui/view/blocks/BlockDefaultView.java | 6 ++--- .../ui/view/blocks/ComplexBlockView.java | 6 ++--- .../web/builder/utils/BlockContentLoader.java | 10 ++++---- .../web/builder/utils/BlocksHandler.java | 4 +-- .../web/builder/utils/DeserializerUtils.java | 4 +-- .../web/builder/utils/DropTargetUtils.java | 2 +- .../block/web/builder/utils/FilterBlocks.java | 2 +- .../web/builder/utils/ProjectBuilder.java | 4 +-- .../utils/eventeditor/BlocksListLoader.java | 2 +- block/core/.gitignore | 1 + block/core/build.gradle | 25 +++++++++++++++++++ .../com/block/web/builder/core}/Block.java | 8 +++--- .../block/web/builder/core}/BlockContent.java | 2 +- .../block/web/builder/core}/BlocksHolder.java | 2 +- .../block/web/builder/core}/ComplexBlock.java | 8 +++--- .../builder/core}/ComplexBlockContent.java | 2 +- .../web/builder/core}/DoubleComplexBlock.java | 8 +++--- .../com/block/web/builder/core}/Event.java | 4 +-- .../com/block/web/builder/core}/WebFile.java | 4 +-- .../core}/blockcontent/BooleanContent.java | 8 +++--- .../core}/blockcontent/NumberContent.java | 8 +++--- .../core}/blockcontent/SourceContent.java | 8 +++--- .../core}/blockcontent/StringContent.java | 8 +++--- .../web/builder/core}/utils/CodeReplacer.java | 3 ++- settings.gradle | 1 + 54 files changed, 151 insertions(+), 122 deletions(-) create mode 100644 block/core/.gitignore create mode 100644 block/core/build.gradle rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/Block.java (96%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/BlockContent.java (94%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/BlocksHolder.java (96%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/ComplexBlock.java (96%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/ComplexBlockContent.java (98%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/DoubleComplexBlock.java (97%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/Event.java (96%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/WebFile.java (96%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/blockcontent/BooleanContent.java (92%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/blockcontent/NumberContent.java (91%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/blockcontent/SourceContent.java (92%) rename {app/src/main/java/com/block/web/builder/objects => block/core/src/main/java/com/block/web/builder/core}/blockcontent/StringContent.java (91%) rename {app/src/main/java/com/block/web/builder => block/core/src/main/java/com/block/web/builder/core}/utils/CodeReplacer.java (91%) diff --git a/app/build.gradle b/app/build.gradle index 68e731e..79961ac 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -164,4 +164,5 @@ dependencies { implementation project(path:':common') implementation project(path:':editor') + implementation project(path:':block:core') } diff --git a/app/src/main/java/builtin/blocks/BuiltInBlocks.java b/app/src/main/java/builtin/blocks/BuiltInBlocks.java index ff6ee03..adc103b 100644 --- a/app/src/main/java/builtin/blocks/BuiltInBlocks.java +++ b/app/src/main/java/builtin/blocks/BuiltInBlocks.java @@ -3,11 +3,11 @@ import builtin.blocks.holder.ControlBlocks; import builtin.blocks.holder.OperatorBlocks; import builtin.blocks.holder.ViewBlocks; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.BlocksHolder; -import com.block.web.builder.objects.blockcontent.SourceContent; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.BlocksHolder; +import com.block.web.builder.core.blockcontent.SourceContent; +import com.block.web.builder.core.utils.CodeReplacer; import java.util.ArrayList; public class BuiltInBlocks { diff --git a/app/src/main/java/builtin/blocks/holder/ControlBlocks.java b/app/src/main/java/builtin/blocks/holder/ControlBlocks.java index 4d2d628..7f7abdd 100644 --- a/app/src/main/java/builtin/blocks/holder/ControlBlocks.java +++ b/app/src/main/java/builtin/blocks/holder/ControlBlocks.java @@ -1,12 +1,12 @@ package builtin.blocks.holder; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.BlocksHolder; -import com.block.web.builder.objects.ComplexBlock; -import com.block.web.builder.objects.blockcontent.BooleanContent; -import com.block.web.builder.objects.blockcontent.SourceContent; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.BlocksHolder; +import com.block.web.builder.core.ComplexBlock; +import com.block.web.builder.core.blockcontent.BooleanContent; +import com.block.web.builder.core.blockcontent.SourceContent; +import com.block.web.builder.core.utils.CodeReplacer; import editor.tsd.tools.Language; import java.util.ArrayList; diff --git a/app/src/main/java/builtin/blocks/holder/OperatorBlocks.java b/app/src/main/java/builtin/blocks/holder/OperatorBlocks.java index 015cde6..6bdfdf4 100644 --- a/app/src/main/java/builtin/blocks/holder/OperatorBlocks.java +++ b/app/src/main/java/builtin/blocks/holder/OperatorBlocks.java @@ -1,12 +1,12 @@ package builtin.blocks.holder; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.BlocksHolder; -import com.block.web.builder.objects.ComplexBlock; -import com.block.web.builder.objects.blockcontent.BooleanContent; -import com.block.web.builder.objects.blockcontent.SourceContent; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.BlocksHolder; +import com.block.web.builder.core.ComplexBlock; +import com.block.web.builder.core.blockcontent.BooleanContent; +import com.block.web.builder.core.blockcontent.SourceContent; +import com.block.web.builder.core.utils.CodeReplacer; import editor.tsd.tools.Language; import java.util.ArrayList; diff --git a/app/src/main/java/builtin/blocks/holder/ViewBlocks.java b/app/src/main/java/builtin/blocks/holder/ViewBlocks.java index ca791c1..c95c591 100644 --- a/app/src/main/java/builtin/blocks/holder/ViewBlocks.java +++ b/app/src/main/java/builtin/blocks/holder/ViewBlocks.java @@ -1,10 +1,10 @@ package builtin.blocks.holder; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.BlocksHolder; -import com.block.web.builder.objects.blockcontent.SourceContent; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.BlocksHolder; +import com.block.web.builder.core.blockcontent.SourceContent; +import com.block.web.builder.core.utils.CodeReplacer; import editor.tsd.tools.Language; import java.util.ArrayList; diff --git a/app/src/main/java/builtin/files/CssFile.java b/app/src/main/java/builtin/files/CssFile.java index 6a2cc23..e6df039 100644 --- a/app/src/main/java/builtin/files/CssFile.java +++ b/app/src/main/java/builtin/files/CssFile.java @@ -1,8 +1,8 @@ package builtin.files; -import com.block.web.builder.objects.Event; -import com.block.web.builder.objects.WebFile; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.Event; +import com.block.web.builder.core.WebFile; +import com.block.web.builder.core.utils.CodeReplacer; import java.util.ArrayList; public class CssFile extends WebFile { diff --git a/app/src/main/java/builtin/files/HtmlFile.java b/app/src/main/java/builtin/files/HtmlFile.java index 43679ad..2e6ebd8 100644 --- a/app/src/main/java/builtin/files/HtmlFile.java +++ b/app/src/main/java/builtin/files/HtmlFile.java @@ -1,8 +1,8 @@ package builtin.files; -import com.block.web.builder.objects.Event; -import com.block.web.builder.objects.WebFile; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.Event; +import com.block.web.builder.core.WebFile; +import com.block.web.builder.core.utils.CodeReplacer; import java.util.ArrayList; public class HtmlFile extends WebFile { diff --git a/app/src/main/java/builtin/files/JavascriptFile.java b/app/src/main/java/builtin/files/JavascriptFile.java index 482b932..ab2c986 100644 --- a/app/src/main/java/builtin/files/JavascriptFile.java +++ b/app/src/main/java/builtin/files/JavascriptFile.java @@ -1,8 +1,8 @@ package builtin.files; -import com.block.web.builder.objects.Event; -import com.block.web.builder.objects.WebFile; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.Event; +import com.block.web.builder.core.WebFile; +import com.block.web.builder.core.utils.CodeReplacer; import java.util.ArrayList; public class JavascriptFile extends WebFile { diff --git a/app/src/main/java/com/block/web/builder/listeners/BlocksHolderListener.java b/app/src/main/java/com/block/web/builder/listeners/BlocksHolderListener.java index f95a273..e8d69c4 100644 --- a/app/src/main/java/com/block/web/builder/listeners/BlocksHolderListener.java +++ b/app/src/main/java/com/block/web/builder/listeners/BlocksHolderListener.java @@ -1,6 +1,6 @@ package com.block.web.builder.listeners; -import com.block.web.builder.objects.BlocksHolder; +import com.block.web.builder.core.BlocksHolder; public interface BlocksHolderListener { void onBlockHolderCreate(BlocksHolder holder); diff --git a/app/src/main/java/com/block/web/builder/listeners/EventAddListener.java b/app/src/main/java/com/block/web/builder/listeners/EventAddListener.java index 8c34f75..027544e 100644 --- a/app/src/main/java/com/block/web/builder/listeners/EventAddListener.java +++ b/app/src/main/java/com/block/web/builder/listeners/EventAddListener.java @@ -1,6 +1,6 @@ package com.block.web.builder.listeners; -import com.block.web.builder.objects.Event; +import com.block.web.builder.core.Event; import java.util.ArrayList; public interface EventAddListener { diff --git a/app/src/main/java/com/block/web/builder/listeners/FileCreationListener.java b/app/src/main/java/com/block/web/builder/listeners/FileCreationListener.java index ff43ad2..6fcbd59 100644 --- a/app/src/main/java/com/block/web/builder/listeners/FileCreationListener.java +++ b/app/src/main/java/com/block/web/builder/listeners/FileCreationListener.java @@ -1,6 +1,6 @@ package com.block.web.builder.listeners; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.WebFile; public interface FileCreationListener { diff --git a/app/src/main/java/com/block/web/builder/ui/activities/BlockEditorActivity.java b/app/src/main/java/com/block/web/builder/ui/activities/BlockEditorActivity.java index 1ac77a0..efe7e33 100644 --- a/app/src/main/java/com/block/web/builder/ui/activities/BlockEditorActivity.java +++ b/app/src/main/java/com/block/web/builder/ui/activities/BlockEditorActivity.java @@ -12,8 +12,8 @@ import com.block.web.builder.R; import com.block.web.builder.databinding.ActivityBlockEditorBinding; import com.block.web.builder.listeners.ValueListener; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlocksHolder; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlocksHolder; import com.block.web.builder.ui.dialogs.blockeditor.AddTextInBlockDialog; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/app/src/main/java/com/block/web/builder/ui/activities/BlockManagerActivity.java b/app/src/main/java/com/block/web/builder/ui/activities/BlockManagerActivity.java index d36ab10..b40092c 100644 --- a/app/src/main/java/com/block/web/builder/ui/activities/BlockManagerActivity.java +++ b/app/src/main/java/com/block/web/builder/ui/activities/BlockManagerActivity.java @@ -8,8 +8,8 @@ import android.widget.Toast; import com.block.web.builder.R; import com.block.web.builder.databinding.ActivityBlockManagerBinding; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlocksHolder; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlocksHolder; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.ObjectInputStream; diff --git a/app/src/main/java/com/block/web/builder/ui/activities/BlocksHolderManagerActivity.java b/app/src/main/java/com/block/web/builder/ui/activities/BlocksHolderManagerActivity.java index 74d604a..09d4377 100644 --- a/app/src/main/java/com/block/web/builder/ui/activities/BlocksHolderManagerActivity.java +++ b/app/src/main/java/com/block/web/builder/ui/activities/BlocksHolderManagerActivity.java @@ -9,7 +9,7 @@ import com.block.web.builder.R; import com.block.web.builder.databinding.ActivityBlocksHolderManagerBinding; import com.block.web.builder.listeners.BlocksHolderListener; -import com.block.web.builder.objects.BlocksHolder; +import com.block.web.builder.core.BlocksHolder; import com.block.web.builder.ui.adapters.BlocksHolderAdapter; import com.block.web.builder.ui.dialogs.blocksholder.CreateBlocksHolderDialog; import java.io.FileInputStream; diff --git a/app/src/main/java/com/block/web/builder/ui/activities/EventEditorActivity.java b/app/src/main/java/com/block/web/builder/ui/activities/EventEditorActivity.java index b3430f2..a1c3b8f 100644 --- a/app/src/main/java/com/block/web/builder/ui/activities/EventEditorActivity.java +++ b/app/src/main/java/com/block/web/builder/ui/activities/EventEditorActivity.java @@ -20,11 +20,11 @@ import com.block.web.builder.databinding.ActivityEventEditorBinding; import com.block.web.builder.listeners.ProjectBuildListener; import com.block.web.builder.listeners.TaskListener; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlocksHolder; -import com.block.web.builder.objects.ComplexBlock; -import com.block.web.builder.objects.Event; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlocksHolder; +import com.block.web.builder.core.ComplexBlock; +import com.block.web.builder.core.Event; +import com.block.web.builder.core.WebFile; import com.block.web.builder.ui.adapters.BlocksHolderEventEditorListItem; import com.block.web.builder.ui.dialogs.eventList.ShowSourceCodeDialog; import com.block.web.builder.ui.utils.BlocksLoader.BlocksLoader; diff --git a/app/src/main/java/com/block/web/builder/ui/activities/EventListActivity.java b/app/src/main/java/com/block/web/builder/ui/activities/EventListActivity.java index 3ff920f..4529c5d 100644 --- a/app/src/main/java/com/block/web/builder/ui/activities/EventListActivity.java +++ b/app/src/main/java/com/block/web/builder/ui/activities/EventListActivity.java @@ -14,8 +14,8 @@ import com.block.web.builder.listeners.EventAddListener; import com.block.web.builder.listeners.ProjectBuildListener; import com.block.web.builder.listeners.TaskListener; -import com.block.web.builder.objects.Event; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.Event; +import com.block.web.builder.core.WebFile; import com.block.web.builder.ui.adapters.EventListAdapter; import com.block.web.builder.ui.dialogs.eventList.AddEventDialog; import com.block.web.builder.ui.dialogs.eventList.ShowSourceCodeDialog; diff --git a/app/src/main/java/com/block/web/builder/ui/activities/FileManagerActivity.java b/app/src/main/java/com/block/web/builder/ui/activities/FileManagerActivity.java index 967931f..a8da8b0 100644 --- a/app/src/main/java/com/block/web/builder/ui/activities/FileManagerActivity.java +++ b/app/src/main/java/com/block/web/builder/ui/activities/FileManagerActivity.java @@ -10,7 +10,7 @@ import com.block.web.builder.R; import com.block.web.builder.databinding.ActivityFileManagerBinding; import com.block.web.builder.listeners.TaskListener; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.WebFile; import com.block.web.builder.ui.adapters.FileListAdapterItem; import com.block.web.builder.ui.dialogs.filemanager.CreateFileDialog; import com.block.web.builder.utils.DeserializationException; diff --git a/app/src/main/java/com/block/web/builder/ui/adapters/BlockListAdapter.java b/app/src/main/java/com/block/web/builder/ui/adapters/BlockListAdapter.java index 106246b..a4f05e4 100644 --- a/app/src/main/java/com/block/web/builder/ui/adapters/BlockListAdapter.java +++ b/app/src/main/java/com/block/web/builder/ui/adapters/BlockListAdapter.java @@ -6,9 +6,9 @@ import android.widget.HorizontalScrollView; import android.widget.LinearLayout; import androidx.recyclerview.widget.RecyclerView; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.ComplexBlock; -import com.block.web.builder.objects.DoubleComplexBlock; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.ComplexBlock; +import com.block.web.builder.core.DoubleComplexBlock; import com.block.web.builder.ui.view.blocks.BlockDefaultView; import com.block.web.builder.ui.view.blocks.ComplexBlockView; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/ui/adapters/BlocksHolderAdapter.java b/app/src/main/java/com/block/web/builder/ui/adapters/BlocksHolderAdapter.java index b99bfc9..53ce62d 100644 --- a/app/src/main/java/com/block/web/builder/ui/adapters/BlocksHolderAdapter.java +++ b/app/src/main/java/com/block/web/builder/ui/adapters/BlocksHolderAdapter.java @@ -8,7 +8,7 @@ import androidx.recyclerview.widget.RecyclerView; import com.block.web.builder.R; import com.block.web.builder.databinding.LayoutBlocksHolderListItemBinding; -import com.block.web.builder.objects.BlocksHolder; +import com.block.web.builder.core.BlocksHolder; import com.block.web.builder.ui.activities.BlockManagerActivity; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/ui/adapters/BlocksHolderEventEditorListItem.java b/app/src/main/java/com/block/web/builder/ui/adapters/BlocksHolderEventEditorListItem.java index 9e50a4d..f150a97 100644 --- a/app/src/main/java/com/block/web/builder/ui/adapters/BlocksHolderEventEditorListItem.java +++ b/app/src/main/java/com/block/web/builder/ui/adapters/BlocksHolderEventEditorListItem.java @@ -6,7 +6,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.block.web.builder.databinding.LayoutEventBlocksHolderListItemBinding; -import com.block.web.builder.objects.BlocksHolder; +import com.block.web.builder.core.BlocksHolder; import com.block.web.builder.ui.activities.EventEditorActivity; import com.block.web.builder.utils.FilterBlocks; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/ui/adapters/EventAdapter.java b/app/src/main/java/com/block/web/builder/ui/adapters/EventAdapter.java index c7d3b1f..9f61bcc 100644 --- a/app/src/main/java/com/block/web/builder/ui/adapters/EventAdapter.java +++ b/app/src/main/java/com/block/web/builder/ui/adapters/EventAdapter.java @@ -5,7 +5,7 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; import com.block.web.builder.databinding.LayoutEventListAdapterBinding; -import com.block.web.builder.objects.Event; +import com.block.web.builder.core.Event; import java.util.ArrayList; public class EventAdapter extends RecyclerView.Adapter { diff --git a/app/src/main/java/com/block/web/builder/ui/adapters/EventListAdapter.java b/app/src/main/java/com/block/web/builder/ui/adapters/EventListAdapter.java index 138d7aa..7db6f60 100644 --- a/app/src/main/java/com/block/web/builder/ui/adapters/EventListAdapter.java +++ b/app/src/main/java/com/block/web/builder/ui/adapters/EventListAdapter.java @@ -6,7 +6,7 @@ import android.view.ViewGroup; import androidx.recyclerview.widget.RecyclerView; import com.block.web.builder.databinding.LayoutEventListItemBinding; -import com.block.web.builder.objects.Event; +import com.block.web.builder.core.Event; import com.block.web.builder.ui.activities.EventEditorActivity; import com.block.web.builder.ui.activities.EventListActivity; import com.block.web.builder.utils.ProjectFileUtils; diff --git a/app/src/main/java/com/block/web/builder/ui/adapters/FileListAdapterItem.java b/app/src/main/java/com/block/web/builder/ui/adapters/FileListAdapterItem.java index 4584c6c..18fa60e 100644 --- a/app/src/main/java/com/block/web/builder/ui/adapters/FileListAdapterItem.java +++ b/app/src/main/java/com/block/web/builder/ui/adapters/FileListAdapterItem.java @@ -9,7 +9,7 @@ import com.block.web.builder.databinding.LayoutFileListItemBinding; import com.block.web.builder.listeners.ProjectBuildListener; import com.block.web.builder.listeners.TaskListener; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.WebFile; import com.block.web.builder.ui.activities.EventListActivity; import com.block.web.builder.ui.activities.FileManagerActivity; import com.block.web.builder.ui.activities.WebViewActivity; diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/blocksholder/CreateBlocksHolderDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/blocksholder/CreateBlocksHolderDialog.java index 65e8190..2446d92 100644 --- a/app/src/main/java/com/block/web/builder/ui/dialogs/blocksholder/CreateBlocksHolderDialog.java +++ b/app/src/main/java/com/block/web/builder/ui/dialogs/blocksholder/CreateBlocksHolderDialog.java @@ -6,7 +6,7 @@ import com.block.web.builder.R; import com.block.web.builder.databinding.LayoutNewBlocksHolderDialogBinding; import com.block.web.builder.listeners.BlocksHolderListener; -import com.block.web.builder.objects.BlocksHolder; +import com.block.web.builder.core.BlocksHolder; import com.block.web.builder.utils.HexColorValidator; import com.google.android.material.dialog.MaterialAlertDialogBuilder; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/AddEventDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/AddEventDialog.java index 537b839..b9021c1 100644 --- a/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/AddEventDialog.java +++ b/app/src/main/java/com/block/web/builder/ui/dialogs/eventList/AddEventDialog.java @@ -6,8 +6,8 @@ import com.block.web.builder.R; import com.block.web.builder.databinding.LayoutAddEventDialogBinding; import com.block.web.builder.listeners.EventAddListener; -import com.block.web.builder.objects.Event; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.Event; +import com.block.web.builder.core.WebFile; import com.block.web.builder.ui.activities.EventListActivity; import com.block.web.builder.ui.adapters.EventAdapter; import com.google.android.material.dialog.MaterialAlertDialogBuilder; diff --git a/app/src/main/java/com/block/web/builder/ui/dialogs/filemanager/CreateFileDialog.java b/app/src/main/java/com/block/web/builder/ui/dialogs/filemanager/CreateFileDialog.java index 514e72d..a0f0556 100644 --- a/app/src/main/java/com/block/web/builder/ui/dialogs/filemanager/CreateFileDialog.java +++ b/app/src/main/java/com/block/web/builder/ui/dialogs/filemanager/CreateFileDialog.java @@ -11,7 +11,7 @@ import com.block.web.builder.R; import com.block.web.builder.databinding.LayoutNewFileDialogBinding; import com.block.web.builder.listeners.FileCreationListener; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.WebFile; import com.block.web.builder.ui.activities.FileManagerActivity; import com.block.web.builder.ui.adapters.FileListAdapterItem; import com.block.web.builder.utils.FileNameValidator; diff --git a/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoader.java b/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoader.java index 988da4d..14cb375 100644 --- a/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoader.java +++ b/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoader.java @@ -4,8 +4,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.ComplexBlock; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.ComplexBlock; import com.block.web.builder.ui.utils.BlocksLoader.BlocksLoaders.ComplexBlockLoader; import com.block.web.builder.ui.utils.BlocksLoader.BlocksLoaders.DefaultBlockLoader; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoaders/ComplexBlockLoader.java b/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoaders/ComplexBlockLoader.java index 221ad2a..fc6e156 100644 --- a/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoaders/ComplexBlockLoader.java +++ b/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoaders/ComplexBlockLoader.java @@ -4,8 +4,8 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import com.block.web.builder.R; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.ComplexBlock; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.ComplexBlock; import com.block.web.builder.ui.activities.EventEditorActivity; import com.block.web.builder.ui.utils.BlocksLoader.BlocksLoader; import com.block.web.builder.ui.view.blocks.ComplexBlockView; diff --git a/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoaders/DefaultBlockLoader.java b/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoaders/DefaultBlockLoader.java index 3364f78..b17e045 100644 --- a/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoaders/DefaultBlockLoader.java +++ b/app/src/main/java/com/block/web/builder/ui/utils/BlocksLoader/BlocksLoaders/DefaultBlockLoader.java @@ -4,7 +4,7 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import com.block.web.builder.R; -import com.block.web.builder.objects.Block; +import com.block.web.builder.core.Block; import com.block.web.builder.ui.activities.EventEditorActivity; import com.block.web.builder.ui.utils.BlocksLoader.BlocksLoader; import com.block.web.builder.ui.view.blocks.BlockDefaultView; diff --git a/app/src/main/java/com/block/web/builder/ui/view/blocks/BlockDefaultView.java b/app/src/main/java/com/block/web/builder/ui/view/blocks/BlockDefaultView.java index 91ed91a..0fa6216 100644 --- a/app/src/main/java/com/block/web/builder/ui/view/blocks/BlockDefaultView.java +++ b/app/src/main/java/com/block/web/builder/ui/view/blocks/BlockDefaultView.java @@ -11,9 +11,9 @@ import android.view.View; import android.widget.LinearLayout; import com.block.web.builder.R; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.ComplexBlock; -import com.block.web.builder.objects.DoubleComplexBlock; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.ComplexBlock; +import com.block.web.builder.core.DoubleComplexBlock; import com.block.web.builder.ui.activities.EventEditorActivity; import com.block.web.builder.utils.BlockContentLoader; import com.block.web.builder.utils.DropTargetUtils; diff --git a/app/src/main/java/com/block/web/builder/ui/view/blocks/ComplexBlockView.java b/app/src/main/java/com/block/web/builder/ui/view/blocks/ComplexBlockView.java index 8431fc7..b01c4ee 100644 --- a/app/src/main/java/com/block/web/builder/ui/view/blocks/ComplexBlockView.java +++ b/app/src/main/java/com/block/web/builder/ui/view/blocks/ComplexBlockView.java @@ -13,9 +13,9 @@ import android.widget.LinearLayout; import android.widget.Toast; import com.block.web.builder.R; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.ComplexBlock; -import com.block.web.builder.objects.DoubleComplexBlock; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.ComplexBlock; +import com.block.web.builder.core.DoubleComplexBlock; import com.block.web.builder.ui.activities.EventEditorActivity; import com.block.web.builder.utils.BlockContentLoader; import com.block.web.builder.utils.DropTargetUtils; diff --git a/app/src/main/java/com/block/web/builder/utils/BlockContentLoader.java b/app/src/main/java/com/block/web/builder/utils/BlockContentLoader.java index 052723d..b4bb363 100644 --- a/app/src/main/java/com/block/web/builder/utils/BlockContentLoader.java +++ b/app/src/main/java/com/block/web/builder/utils/BlockContentLoader.java @@ -9,11 +9,11 @@ import android.widget.TextView; import android.widget.Toast; import com.block.web.builder.R; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.ComplexBlockContent; -import com.block.web.builder.objects.blockcontent.BooleanContent; -import com.block.web.builder.objects.blockcontent.SourceContent; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.ComplexBlockContent; +import com.block.web.builder.core.blockcontent.BooleanContent; +import com.block.web.builder.core.blockcontent.SourceContent; import com.block.web.builder.ui.activities.EventEditorActivity; import com.block.web.builder.ui.activities.SettingActivity; import com.block.web.builder.ui.view.blocks.BlockDefaultView; diff --git a/app/src/main/java/com/block/web/builder/utils/BlocksHandler.java b/app/src/main/java/com/block/web/builder/utils/BlocksHandler.java index cd1dd85..a1e5410 100644 --- a/app/src/main/java/com/block/web/builder/utils/BlocksHandler.java +++ b/app/src/main/java/com/block/web/builder/utils/BlocksHandler.java @@ -1,8 +1,8 @@ package com.block.web.builder.utils; import android.view.ViewGroup; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.ComplexBlock; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.ComplexBlock; import com.block.web.builder.ui.view.blocks.BlockDefaultView; import com.block.web.builder.ui.view.blocks.ComplexBlockView; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/utils/DeserializerUtils.java b/app/src/main/java/com/block/web/builder/utils/DeserializerUtils.java index ac950b1..4a3f9f8 100644 --- a/app/src/main/java/com/block/web/builder/utils/DeserializerUtils.java +++ b/app/src/main/java/com/block/web/builder/utils/DeserializerUtils.java @@ -1,8 +1,8 @@ package com.block.web.builder.utils; import com.block.web.builder.listeners.TaskListener; -import com.block.web.builder.objects.Event; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.Event; +import com.block.web.builder.core.WebFile; import com.block.web.builder.utils.preferences.BasePreference; import java.io.File; import java.io.FileInputStream; diff --git a/app/src/main/java/com/block/web/builder/utils/DropTargetUtils.java b/app/src/main/java/com/block/web/builder/utils/DropTargetUtils.java index 3e55cd1..7eeb342 100644 --- a/app/src/main/java/com/block/web/builder/utils/DropTargetUtils.java +++ b/app/src/main/java/com/block/web/builder/utils/DropTargetUtils.java @@ -3,7 +3,7 @@ import android.view.View; import android.view.ViewGroup; import com.block.web.builder.R; -import com.block.web.builder.objects.Block; +import com.block.web.builder.core.Block; public class DropTargetUtils { public static void addDragTarget( diff --git a/app/src/main/java/com/block/web/builder/utils/FilterBlocks.java b/app/src/main/java/com/block/web/builder/utils/FilterBlocks.java index 8964610..ee71b31 100644 --- a/app/src/main/java/com/block/web/builder/utils/FilterBlocks.java +++ b/app/src/main/java/com/block/web/builder/utils/FilterBlocks.java @@ -1,7 +1,7 @@ package com.block.web.builder.utils; import com.block.web.builder.BuildConfig; -import com.block.web.builder.objects.Block; +import com.block.web.builder.core.Block; import editor.tsd.tools.Language; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/utils/ProjectBuilder.java b/app/src/main/java/com/block/web/builder/utils/ProjectBuilder.java index c1f7e32..ad1e245 100644 --- a/app/src/main/java/com/block/web/builder/utils/ProjectBuilder.java +++ b/app/src/main/java/com/block/web/builder/utils/ProjectBuilder.java @@ -6,8 +6,8 @@ import android.code.editor.common.utils.FileUtils; import com.block.web.builder.listeners.ProjectBuildListener; import com.block.web.builder.listeners.TaskListener; -import com.block.web.builder.objects.Event; -import com.block.web.builder.objects.WebFile; +import com.block.web.builder.core.Event; +import com.block.web.builder.core.WebFile; import java.io.File; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/utils/eventeditor/BlocksListLoader.java b/app/src/main/java/com/block/web/builder/utils/eventeditor/BlocksListLoader.java index 073e8d0..3173d69 100644 --- a/app/src/main/java/com/block/web/builder/utils/eventeditor/BlocksListLoader.java +++ b/app/src/main/java/com/block/web/builder/utils/eventeditor/BlocksListLoader.java @@ -5,7 +5,7 @@ import android.app.Activity; import builtin.blocks.BuiltInBlocks; import com.block.web.builder.BuildConfig; -import com.block.web.builder.objects.BlocksHolder; +import com.block.web.builder.core.BlocksHolder; import editor.tsd.tools.Language; import java.io.FileInputStream; import java.io.ObjectInputStream; diff --git a/block/core/.gitignore b/block/core/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/block/core/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/block/core/build.gradle b/block/core/build.gradle new file mode 100644 index 0000000..daa6b1a --- /dev/null +++ b/block/core/build.gradle @@ -0,0 +1,25 @@ +plugins { + id 'com.android.library' +} + +android { + namespace "com.block.web.builder.core" + + defaultConfig { + minSdk 21 + targetSdk 28 + compileSdkVersion 34 + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } +} diff --git a/app/src/main/java/com/block/web/builder/objects/Block.java b/block/core/src/main/java/com/block/web/builder/core/Block.java similarity index 96% rename from app/src/main/java/com/block/web/builder/objects/Block.java rename to block/core/src/main/java/com/block/web/builder/core/Block.java index 1e99af0..0a41c10 100644 --- a/app/src/main/java/com/block/web/builder/objects/Block.java +++ b/block/core/src/main/java/com/block/web/builder/core/Block.java @@ -1,8 +1,8 @@ -package com.block.web.builder.objects; +package com.block.web.builder.core; -import com.block.web.builder.objects.blockcontent.BooleanContent; -import com.block.web.builder.objects.blockcontent.SourceContent; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.blockcontent.BooleanContent; +import com.block.web.builder.core.blockcontent.SourceContent; +import com.block.web.builder.core.utils.CodeReplacer; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/objects/BlockContent.java b/block/core/src/main/java/com/block/web/builder/core/BlockContent.java similarity index 94% rename from app/src/main/java/com/block/web/builder/objects/BlockContent.java rename to block/core/src/main/java/com/block/web/builder/core/BlockContent.java index c8d369a..2b59926 100644 --- a/app/src/main/java/com/block/web/builder/objects/BlockContent.java +++ b/block/core/src/main/java/com/block/web/builder/core/BlockContent.java @@ -1,4 +1,4 @@ -package com.block.web.builder.objects; +package com.block.web.builder.core; import java.io.Serializable; diff --git a/app/src/main/java/com/block/web/builder/objects/BlocksHolder.java b/block/core/src/main/java/com/block/web/builder/core/BlocksHolder.java similarity index 96% rename from app/src/main/java/com/block/web/builder/objects/BlocksHolder.java rename to block/core/src/main/java/com/block/web/builder/core/BlocksHolder.java index 2c531bc..e2217c6 100644 --- a/app/src/main/java/com/block/web/builder/objects/BlocksHolder.java +++ b/block/core/src/main/java/com/block/web/builder/core/BlocksHolder.java @@ -1,4 +1,4 @@ -package com.block.web.builder.objects; +package com.block.web.builder.core; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/objects/ComplexBlock.java b/block/core/src/main/java/com/block/web/builder/core/ComplexBlock.java similarity index 96% rename from app/src/main/java/com/block/web/builder/objects/ComplexBlock.java rename to block/core/src/main/java/com/block/web/builder/core/ComplexBlock.java index 8986db9..9b35287 100644 --- a/app/src/main/java/com/block/web/builder/objects/ComplexBlock.java +++ b/block/core/src/main/java/com/block/web/builder/core/ComplexBlock.java @@ -1,9 +1,9 @@ -package com.block.web.builder.objects; +package com.block.web.builder.core; import android.util.Log; -import com.block.web.builder.objects.blockcontent.BooleanContent; -import com.block.web.builder.objects.blockcontent.SourceContent; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.blockcontent.BooleanContent; +import com.block.web.builder.core.blockcontent.SourceContent; +import com.block.web.builder.core.utils.CodeReplacer; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/objects/ComplexBlockContent.java b/block/core/src/main/java/com/block/web/builder/core/ComplexBlockContent.java similarity index 98% rename from app/src/main/java/com/block/web/builder/objects/ComplexBlockContent.java rename to block/core/src/main/java/com/block/web/builder/core/ComplexBlockContent.java index f56a345..eae2995 100644 --- a/app/src/main/java/com/block/web/builder/objects/ComplexBlockContent.java +++ b/block/core/src/main/java/com/block/web/builder/core/ComplexBlockContent.java @@ -1,4 +1,4 @@ -package com.block.web.builder.objects; +package com.block.web.builder.core; import java.io.Serializable; diff --git a/app/src/main/java/com/block/web/builder/objects/DoubleComplexBlock.java b/block/core/src/main/java/com/block/web/builder/core/DoubleComplexBlock.java similarity index 97% rename from app/src/main/java/com/block/web/builder/objects/DoubleComplexBlock.java rename to block/core/src/main/java/com/block/web/builder/core/DoubleComplexBlock.java index 21ec993..6914a8f 100644 --- a/app/src/main/java/com/block/web/builder/objects/DoubleComplexBlock.java +++ b/block/core/src/main/java/com/block/web/builder/core/DoubleComplexBlock.java @@ -1,8 +1,8 @@ -package com.block.web.builder.objects; +package com.block.web.builder.core; -import com.block.web.builder.objects.blockcontent.BooleanContent; -import com.block.web.builder.objects.blockcontent.SourceContent; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.blockcontent.BooleanContent; +import com.block.web.builder.core.blockcontent.SourceContent; +import com.block.web.builder.core.utils.CodeReplacer; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/objects/Event.java b/block/core/src/main/java/com/block/web/builder/core/Event.java similarity index 96% rename from app/src/main/java/com/block/web/builder/objects/Event.java rename to block/core/src/main/java/com/block/web/builder/core/Event.java index a2fda68..015f637 100644 --- a/app/src/main/java/com/block/web/builder/objects/Event.java +++ b/block/core/src/main/java/com/block/web/builder/core/Event.java @@ -1,6 +1,6 @@ -package com.block.web.builder.objects; +package com.block.web.builder.core; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.utils.CodeReplacer; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/objects/WebFile.java b/block/core/src/main/java/com/block/web/builder/core/WebFile.java similarity index 96% rename from app/src/main/java/com/block/web/builder/objects/WebFile.java rename to block/core/src/main/java/com/block/web/builder/core/WebFile.java index 8f17aae..076ba99 100644 --- a/app/src/main/java/com/block/web/builder/objects/WebFile.java +++ b/block/core/src/main/java/com/block/web/builder/core/WebFile.java @@ -1,6 +1,6 @@ -package com.block.web.builder.objects; +package com.block.web.builder.core; -import com.block.web.builder.utils.CodeReplacer; +import com.block.web.builder.core.utils.CodeReplacer; import java.io.Serializable; import java.util.ArrayList; diff --git a/app/src/main/java/com/block/web/builder/objects/blockcontent/BooleanContent.java b/block/core/src/main/java/com/block/web/builder/core/blockcontent/BooleanContent.java similarity index 92% rename from app/src/main/java/com/block/web/builder/objects/blockcontent/BooleanContent.java rename to block/core/src/main/java/com/block/web/builder/core/blockcontent/BooleanContent.java index db1711b..2234295 100644 --- a/app/src/main/java/com/block/web/builder/objects/blockcontent/BooleanContent.java +++ b/block/core/src/main/java/com/block/web/builder/core/blockcontent/BooleanContent.java @@ -1,8 +1,8 @@ -package com.block.web.builder.objects.blockcontent; +package com.block.web.builder.core.blockcontent; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.ComplexBlockContent; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.ComplexBlockContent; public class BooleanContent extends ComplexBlockContent implements Cloneable { public BooleanContent() { diff --git a/app/src/main/java/com/block/web/builder/objects/blockcontent/NumberContent.java b/block/core/src/main/java/com/block/web/builder/core/blockcontent/NumberContent.java similarity index 91% rename from app/src/main/java/com/block/web/builder/objects/blockcontent/NumberContent.java rename to block/core/src/main/java/com/block/web/builder/core/blockcontent/NumberContent.java index ffd27d1..93aa296 100644 --- a/app/src/main/java/com/block/web/builder/objects/blockcontent/NumberContent.java +++ b/block/core/src/main/java/com/block/web/builder/core/blockcontent/NumberContent.java @@ -1,8 +1,8 @@ -package com.block.web.builder.objects.blockcontent; +package com.block.web.builder.core.blockcontent; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.ComplexBlockContent; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.ComplexBlockContent; public class NumberContent extends ComplexBlockContent implements Cloneable { public NumberContent() { diff --git a/app/src/main/java/com/block/web/builder/objects/blockcontent/SourceContent.java b/block/core/src/main/java/com/block/web/builder/core/blockcontent/SourceContent.java similarity index 92% rename from app/src/main/java/com/block/web/builder/objects/blockcontent/SourceContent.java rename to block/core/src/main/java/com/block/web/builder/core/blockcontent/SourceContent.java index 4ddad66..cc1e221 100644 --- a/app/src/main/java/com/block/web/builder/objects/blockcontent/SourceContent.java +++ b/block/core/src/main/java/com/block/web/builder/core/blockcontent/SourceContent.java @@ -1,8 +1,8 @@ -package com.block.web.builder.objects.blockcontent; +package com.block.web.builder.core.blockcontent; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.ComplexBlockContent; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.ComplexBlockContent; public class SourceContent extends ComplexBlockContent implements Cloneable { public SourceContent() { diff --git a/app/src/main/java/com/block/web/builder/objects/blockcontent/StringContent.java b/block/core/src/main/java/com/block/web/builder/core/blockcontent/StringContent.java similarity index 91% rename from app/src/main/java/com/block/web/builder/objects/blockcontent/StringContent.java rename to block/core/src/main/java/com/block/web/builder/core/blockcontent/StringContent.java index 59d8e4f..a1c723c 100644 --- a/app/src/main/java/com/block/web/builder/objects/blockcontent/StringContent.java +++ b/block/core/src/main/java/com/block/web/builder/core/blockcontent/StringContent.java @@ -1,8 +1,8 @@ -package com.block.web.builder.objects.blockcontent; +package com.block.web.builder.core.blockcontent; -import com.block.web.builder.objects.Block; -import com.block.web.builder.objects.BlockContent; -import com.block.web.builder.objects.ComplexBlockContent; +import com.block.web.builder.core.Block; +import com.block.web.builder.core.BlockContent; +import com.block.web.builder.core.ComplexBlockContent; public class StringContent extends ComplexBlockContent implements Cloneable { public StringContent() { diff --git a/app/src/main/java/com/block/web/builder/utils/CodeReplacer.java b/block/core/src/main/java/com/block/web/builder/core/utils/CodeReplacer.java similarity index 91% rename from app/src/main/java/com/block/web/builder/utils/CodeReplacer.java rename to block/core/src/main/java/com/block/web/builder/core/utils/CodeReplacer.java index 8538b9b..e56e465 100644 --- a/app/src/main/java/com/block/web/builder/utils/CodeReplacer.java +++ b/block/core/src/main/java/com/block/web/builder/core/utils/CodeReplacer.java @@ -1,4 +1,5 @@ -package com.block.web.builder.utils; +package com.block.web.builder.core.utils; + import java.util.regex.Pattern; public class CodeReplacer { diff --git a/settings.gradle b/settings.gradle index afe8818..714ccca 100644 --- a/settings.gradle +++ b/settings.gradle @@ -18,3 +18,4 @@ rootProject.name = "BlockWeb Builder" include(":app") include(":common") include(":editor") +include(":block:core")