From 309dd4ff553c2e847016d247d1042b45e456f4bf Mon Sep 17 00:00:00 2001 From: "pengfei.zhou" Date: Mon, 22 Jul 2019 15:40:28 +0800 Subject: [PATCH] rename shader package name --- .../github/penfeizhou/doric/DoricContext.java | 8 +------- .../github/penfeizhou/doric/DoricRegistry.java | 10 +++++----- .../doric/extension/render/DoricShader.java | 17 ----------------- .../penfeizhou/doric/plugin/ShaderPlugin.java | 5 +---- .../doric/{widget => shader}/GroupNode.java | 2 +- .../doric/{widget => shader}/ImageNode.java | 2 +- .../doric/{widget => shader}/RootNode.java | 3 +-- .../doric/{widget => shader}/StackNode.java | 2 +- .../doric/{widget => shader}/TextNode.java | 2 +- .../doric/{widget => shader}/ViewNode.java | 2 +- 10 files changed, 13 insertions(+), 40 deletions(-) delete mode 100644 Android/doric/src/main/java/com/github/penfeizhou/doric/extension/render/DoricShader.java rename Android/doric/src/main/java/com/github/penfeizhou/doric/{widget => shader}/GroupNode.java (98%) rename Android/doric/src/main/java/com/github/penfeizhou/doric/{widget => shader}/ImageNode.java (92%) rename Android/doric/src/main/java/com/github/penfeizhou/doric/{widget => shader}/RootNode.java (90%) rename Android/doric/src/main/java/com/github/penfeizhou/doric/{widget => shader}/StackNode.java (93%) rename Android/doric/src/main/java/com/github/penfeizhou/doric/{widget => shader}/TextNode.java (92%) rename Android/doric/src/main/java/com/github/penfeizhou/doric/{widget => shader}/ViewNode.java (98%) diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContext.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContext.java index 72fba673..4467096a 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContext.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricContext.java @@ -1,16 +1,11 @@ package com.github.penfeizhou.doric; import android.content.Context; -import android.view.ViewGroup; -import android.widget.FrameLayout; import com.github.penfeizhou.doric.async.AsyncResult; -import com.github.penfeizhou.doric.extension.render.DoricShader; import com.github.penfeizhou.doric.plugin.DoricJavaPlugin; import com.github.penfeizhou.doric.utils.DoricMetaInfo; -import com.github.penfeizhou.doric.widget.GroupNode; -import com.github.penfeizhou.doric.widget.RootNode; -import com.github.penfeizhou.doric.widget.StackNode; +import com.github.penfeizhou.doric.shader.RootNode; import com.github.pengfeizhou.jscore.JSDecoder; import java.util.HashMap; @@ -25,7 +20,6 @@ public class DoricContext { private final String mContextId; private final Map mPluginMap = new HashMap<>(); private final Context mContext; - private DoricShader doricShader = new DoricShader(getDriver().getRegistry()); private RootNode mRootNode = new RootNode(this); DoricContext(Context context, String contextId) { diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricRegistry.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricRegistry.java index b5af1d17..9310c3d8 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricRegistry.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/DoricRegistry.java @@ -3,11 +3,11 @@ package com.github.penfeizhou.doric; import android.text.TextUtils; import com.github.penfeizhou.doric.plugin.ShaderPlugin; -import com.github.penfeizhou.doric.widget.ImageNode; -import com.github.penfeizhou.doric.widget.RootNode; -import com.github.penfeizhou.doric.widget.StackNode; -import com.github.penfeizhou.doric.widget.TextNode; -import com.github.penfeizhou.doric.widget.ViewNode; +import com.github.penfeizhou.doric.shader.ImageNode; +import com.github.penfeizhou.doric.shader.RootNode; +import com.github.penfeizhou.doric.shader.StackNode; +import com.github.penfeizhou.doric.shader.TextNode; +import com.github.penfeizhou.doric.shader.ViewNode; import com.github.penfeizhou.doric.utils.DoricMetaInfo; import com.github.penfeizhou.doric.plugin.DoricJavaPlugin; import com.github.penfeizhou.doric.plugin.ModalPlugin; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/render/DoricShader.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/render/DoricShader.java deleted file mode 100644 index bcd271d2..00000000 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/extension/render/DoricShader.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.github.penfeizhou.doric.extension.render; - -import com.github.penfeizhou.doric.DoricRegistry; - -/** - * @Description: com.github.penfeizhou.doric.render - * @Author: pengfei.zhou - * @CreateDate: 2019-07-20 - */ -public class DoricShader { - - private final DoricRegistry mRegistry; - - public DoricShader(DoricRegistry doricRegistry) { - mRegistry = doricRegistry; - } -} diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ShaderPlugin.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ShaderPlugin.java index 8386b56e..d0a602ce 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ShaderPlugin.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/plugin/ShaderPlugin.java @@ -1,14 +1,11 @@ package com.github.penfeizhou.doric.plugin; -import android.view.ViewGroup; - import com.github.penfeizhou.doric.DoricContext; import com.github.penfeizhou.doric.extension.bridge.DoricMethod; import com.github.penfeizhou.doric.extension.bridge.DoricPlugin; import com.github.penfeizhou.doric.utils.DoricLog; import com.github.penfeizhou.doric.utils.ThreadMode; -import com.github.penfeizhou.doric.widget.GroupNode; -import com.github.penfeizhou.doric.widget.RootNode; +import com.github.penfeizhou.doric.shader.RootNode; import com.github.pengfeizhou.jscore.JSDecoder; import com.github.pengfeizhou.jscore.JSObject; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/GroupNode.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/GroupNode.java similarity index 98% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/widget/GroupNode.java rename to Android/doric/src/main/java/com/github/penfeizhou/doric/shader/GroupNode.java index d6453ded..4e1c4580 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/GroupNode.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/GroupNode.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.widget; +package com.github.penfeizhou.doric.shader; import android.util.SparseArray; import android.view.ViewGroup; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/ImageNode.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ImageNode.java similarity index 92% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/widget/ImageNode.java rename to Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ImageNode.java index bf92341e..ef758a34 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/ImageNode.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ImageNode.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.widget; +package com.github.penfeizhou.doric.shader; import android.widget.ImageView; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/RootNode.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/RootNode.java similarity index 90% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/widget/RootNode.java rename to Android/doric/src/main/java/com/github/penfeizhou/doric/shader/RootNode.java index dd3a6527..4a571fac 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/RootNode.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/RootNode.java @@ -1,6 +1,5 @@ -package com.github.penfeizhou.doric.widget; +package com.github.penfeizhou.doric.shader; -import android.view.ViewGroup; import android.widget.FrameLayout; import com.github.penfeizhou.doric.DoricContext; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/StackNode.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/StackNode.java similarity index 93% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/widget/StackNode.java rename to Android/doric/src/main/java/com/github/penfeizhou/doric/shader/StackNode.java index 175a5a16..08a9592b 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/StackNode.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/StackNode.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.widget; +package com.github.penfeizhou.doric.shader; import android.widget.FrameLayout; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/TextNode.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/TextNode.java similarity index 92% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/widget/TextNode.java rename to Android/doric/src/main/java/com/github/penfeizhou/doric/shader/TextNode.java index 753ed266..731cfdf6 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/TextNode.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/TextNode.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.widget; +package com.github.penfeizhou.doric.shader; import android.widget.TextView; diff --git a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/ViewNode.java b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ViewNode.java similarity index 98% rename from Android/doric/src/main/java/com/github/penfeizhou/doric/widget/ViewNode.java rename to Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ViewNode.java index 70932d3f..a20bd3c9 100644 --- a/Android/doric/src/main/java/com/github/penfeizhou/doric/widget/ViewNode.java +++ b/Android/doric/src/main/java/com/github/penfeizhou/doric/shader/ViewNode.java @@ -1,4 +1,4 @@ -package com.github.penfeizhou.doric.widget; +package com.github.penfeizhou.doric.shader; import android.content.Context; import android.view.View;