You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by so...@apache.org on 2017/06/02 02:50:04 UTC
[10/36] incubator-weex git commit: + [android] provide default style
for border
+ [android] provide default style for border
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/51c58757
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/51c58757
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/51c58757
Branch: refs/heads/0.14-dev
Commit: 51c5875759e6c5899e18d08dbdc893652c1ae4dc
Parents: 8acc6e6
Author: moxun.ljf <fu...@foxmail.com>
Authored: Mon May 22 16:51:31 2017 +0800
Committer: moxun.ljf <fu...@foxmail.com>
Committed: Mon May 22 16:51:31 2017 +0800
----------------------------------------------------------------------
.../taobao/weex/ui/component/WXComponent.java | 23 ++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/51c58757/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
index 4de2a32..659cb16 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXComponent.java
@@ -1369,8 +1369,27 @@ public abstract class WXComponent<T extends View> implements IWXObject, IWXActi
*/
@CheckResult
protected Object convertEmptyProperty(String propName, Object originalValue) {
- if (Constants.Name.BACKGROUND_COLOR.equals(propName)) {
- return "transparent";
+ switch (propName) {
+ case Constants.Name.BACKGROUND_COLOR:
+ return "transparent";
+ case Constants.Name.BORDER_RADIUS:
+ case Constants.Name.BORDER_BOTTOM_LEFT_RADIUS:
+ case Constants.Name.BORDER_BOTTOM_RIGHT_RADIUS:
+ case Constants.Name.BORDER_TOP_LEFT_RADIUS:
+ case Constants.Name.BORDER_TOP_RIGHT_RADIUS:
+ return 0;
+ case Constants.Name.BORDER_WIDTH:
+ case Constants.Name.BORDER_TOP_WIDTH:
+ case Constants.Name.BORDER_LEFT_WIDTH:
+ case Constants.Name.BORDER_RIGHT_WIDTH:
+ case Constants.Name.BORDER_BOTTOM_WIDTH:
+ return 0;
+ case Constants.Name.BORDER_COLOR:
+ case Constants.Name.BORDER_TOP_COLOR:
+ case Constants.Name.BORDER_LEFT_COLOR:
+ case Constants.Name.BORDER_RIGHT_COLOR:
+ case Constants.Name.BORDER_BOTTOM_COLOR:
+ return "black";
}
return originalValue;
}