Skip to content

Commit

Permalink
Move core java file required for Blocks, Event, Web file into build/c…
Browse files Browse the repository at this point in the history
…ore module
  • Loading branch information
SyntaxGalaxy committed Jan 31, 2024
1 parent 4fed477 commit efd2039
Show file tree
Hide file tree
Showing 54 changed files with 151 additions and 122 deletions.
1 change: 1 addition & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -164,4 +164,5 @@ dependencies {

implementation project(path:':common')
implementation project(path:':editor')
implementation project(path:':block:core')
}
10 changes: 5 additions & 5 deletions app/src/main/java/builtin/blocks/BuiltInBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/builtin/blocks/holder/ControlBlocks.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
14 changes: 7 additions & 7 deletions app/src/main/java/builtin/blocks/holder/OperatorBlocks.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
10 changes: 5 additions & 5 deletions app/src/main/java/builtin/blocks/holder/ViewBlocks.java
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/builtin/files/CssFile.java
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/builtin/files/HtmlFile.java
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/builtin/files/JavascriptFile.java
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<EventAdapter.ViewHolder> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Loading

0 comments on commit efd2039

Please sign in to comment.