You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ky...@apache.org on 2017/09/13 09:36:43 UTC
[1/2] incubator-weex git commit: - [android] Remove useless method.
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev 701c4b972 -> 96c52aec5
- [android] Remove useless method.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/04180c9e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/04180c9e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/04180c9e
Branch: refs/heads/0.16-dev
Commit: 04180c9e8ca01be0c35e3ab50bb3d673e8fc7fd6
Parents: d82509d
Author: YorkShen <sh...@gmail.com>
Authored: Mon Sep 11 11:33:16 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Sep 13 16:05:20 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/dom/WXStyle.java | 17 ---------
.../weex/ui/view/border/BorderCorner.java | 37 +++++++++++---------
.../taobao/weex/ui/view/border/BorderUtil.java | 26 --------------
.../weex/ui/view/border/BottomLeftCorner.java | 7 +---
.../weex/ui/view/border/BottomRightCorner.java | 7 +---
.../weex/ui/view/border/TopLeftCorner.java | 7 +---
.../weex/ui/view/border/TopRightCorner.java | 7 +---
.../com/taobao/weex/utils/FunctionParser.java | 6 ----
8 files changed, 25 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/04180c9e/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
index 01c25d2..6dc444a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXStyle.java
@@ -346,23 +346,6 @@ public class WXStyle implements Map<String, Object>,Cloneable {
return WXUtils.getFloatByViewport(get(Constants.Name.BORDER_WIDTH), viewport);
}
- public float getBorderRightWidth() {
- return getBorderWidth(Constants.Name.BORDER_RIGHT_WIDTH);
- }
-
- public float getBorderTopWidth() {
- return getBorderWidth(Constants.Name.BORDER_TOP_WIDTH);
- }
-
- public float getBorderBottomWidth() {
- return getBorderWidth(Constants.Name.BORDER_BOTTOM_WIDTH);
- }
-
- public float getBorderLeftWidth() {
- return getBorderWidth(Constants.Name.BORDER_LEFT_WIDTH);
- }
-
-
public float getBorderRightWidth(int viewport) {
return getBorderWidth(Constants.Name.BORDER_RIGHT_WIDTH, viewport);
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/04180c9e/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderCorner.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderCorner.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderCorner.java
index a396063..07ff38f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderCorner.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderCorner.java
@@ -31,13 +31,15 @@ abstract class BorderCorner {
private final float mPreBorderWidth;
private final float mPostBorderWidth;
private final RectF mBorderBox;
+ protected final float mAngleBisector;
- BorderCorner(float cornerRadius, float preBorderWidth, float postBorderWidth, @NonNull RectF
- borderBox) {
+ BorderCorner(float cornerRadius, float preBorderWidth, float postBorderWidth,
+ @NonNull RectF borderBox, float angleBisector) {
mCornerRadius = cornerRadius;
mPreBorderWidth = preBorderWidth;
mPostBorderWidth = postBorderWidth;
mBorderBox = borderBox;
+ mAngleBisector = angleBisector;
}
/**
@@ -61,18 +63,26 @@ abstract class BorderCorner {
return getOuterCornerRadius() > 0 && !FloatUtil.floatsEqual(0, getOuterCornerRadius());
}
- protected float getPreBorderWidth() {
+ protected final float getPreBorderWidth() {
return mPreBorderWidth;
}
- protected float getPostBorderWidth() {
+ protected final float getPostBorderWidth() {
return mPostBorderWidth;
}
- protected float getOuterCornerRadius() {
+ protected final float getOuterCornerRadius() {
return mCornerRadius;
}
+ protected final float getAngleBisectorDegree(){
+ return mAngleBisector;
+ }
+
+ protected final RectF getBorderBox() {
+ return mBorderBox;
+ }
+
/**
* Get the staring point of the corner.
* @return the starting point of the corner.
@@ -88,12 +98,6 @@ abstract class BorderCorner {
return lineStart;
}
- @NonNull
- abstract protected PointF getRoundCornerStart();
-
- @NonNull
- abstract protected PointF getSharpCornerVertex();
-
/**
* Get the ending point of the corner.
* @return the ending point of the corner.
@@ -110,9 +114,13 @@ abstract class BorderCorner {
}
@NonNull
- abstract protected PointF getRoundCornerEnd();
+ abstract protected PointF getRoundCornerStart();
+
+ @NonNull
+ abstract protected PointF getSharpCornerVertex();
- abstract protected float getAngleBisectorDegree();
+ @NonNull
+ abstract protected PointF getRoundCornerEnd();
@NonNull
abstract protected PointF getSharpCornerStart();
@@ -126,7 +134,4 @@ abstract class BorderCorner {
@NonNull
abstract protected RectF getOvalIfInnerCornerNotExist();
- protected RectF getBorderBox() {
- return mBorderBox;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/04180c9e/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderUtil.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderUtil.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderUtil.java
index 4ce218e..b768eb5 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderUtil.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BorderUtil.java
@@ -78,30 +78,4 @@ class BorderUtil {
}
}
}
-
- static boolean areEdgesSame(float... numbers) {
- if (numbers != null && numbers.length > 0) {
- float init = numbers[0];
- for (float number : numbers) {
- if (number != init) {
- return false;
- }
- }
- return true;
- }
- return false;
- }
-
- static boolean areEdgesSame(int... numbers) {
- if (numbers != null && numbers.length > 0) {
- int init = numbers[0];
- for (int number : numbers) {
- if (number != init) {
- return false;
- }
- }
- return true;
- }
- return false;
- }
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/04180c9e/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomLeftCorner.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomLeftCorner.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomLeftCorner.java
index cf24477..3c01a76 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomLeftCorner.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomLeftCorner.java
@@ -25,12 +25,7 @@ import android.support.annotation.NonNull;
class BottomLeftCorner extends BorderCorner {
BottomLeftCorner(float cornerRadius, float preBorderWidth, float postBorderWidth, @NonNull RectF borderBox) {
- super(cornerRadius, preBorderWidth, postBorderWidth, borderBox);
- }
-
- @Override
- protected float getAngleBisectorDegree() {
- return 135;
+ super(cornerRadius, preBorderWidth, postBorderWidth, borderBox, 135);
}
@NonNull
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/04180c9e/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomRightCorner.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomRightCorner.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomRightCorner.java
index de444c1..2ed50a4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomRightCorner.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/BottomRightCorner.java
@@ -25,12 +25,7 @@ import android.support.annotation.NonNull;
class BottomRightCorner extends BorderCorner {
BottomRightCorner(float cornerRadius, float preBorderWidth, float postBorderWidth, @NonNull RectF borderBox) {
- super(cornerRadius, preBorderWidth, postBorderWidth, borderBox);
- }
-
- @Override
- protected float getAngleBisectorDegree() {
- return 45;
+ super(cornerRadius, preBorderWidth, postBorderWidth, borderBox, 45);
}
@NonNull
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/04180c9e/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopLeftCorner.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopLeftCorner.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopLeftCorner.java
index ce63c4b..e83706f 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopLeftCorner.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopLeftCorner.java
@@ -25,12 +25,7 @@ import android.support.annotation.NonNull;
class TopLeftCorner extends BorderCorner {
TopLeftCorner(float cornerRadius, float preBorderWidth, float postBorderWidth, @NonNull RectF borderBox) {
- super(cornerRadius, preBorderWidth, postBorderWidth, borderBox);
- }
-
- @Override
- protected float getAngleBisectorDegree() {
- return 225;
+ super(cornerRadius, preBorderWidth, postBorderWidth, borderBox, 225);
}
@NonNull
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/04180c9e/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopRightCorner.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopRightCorner.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopRightCorner.java
index 77a513f..0ea4377 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopRightCorner.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/border/TopRightCorner.java
@@ -25,12 +25,7 @@ import android.support.annotation.NonNull;
class TopRightCorner extends BorderCorner {
TopRightCorner(float cornerRadius, float preBorderWidth, float postBorderWidth, @NonNull RectF borderBox) {
- super(cornerRadius, preBorderWidth, postBorderWidth, borderBox);
- }
-
- @Override
- protected float getAngleBisectorDegree() {
- return 315;
+ super(cornerRadius, preBorderWidth, postBorderWidth, borderBox, 315);
}
@NonNull
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/04180c9e/android/sdk/src/main/java/com/taobao/weex/utils/FunctionParser.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/utils/FunctionParser.java b/android/sdk/src/main/java/com/taobao/weex/utils/FunctionParser.java
index e138213..ba9103e 100644
--- a/android/sdk/src/main/java/com/taobao/weex/utils/FunctionParser.java
+++ b/android/sdk/src/main/java/com/taobao/weex/utils/FunctionParser.java
@@ -227,12 +227,6 @@ public class FunctionParser<K, V> {
return true;
}
- private void reset() {
- pointer = 0;
- value = null;
- current = null;
- }
-
private boolean isCharacterOrDigit(char letter) {
return (ZERO <= letter && letter <= NINE) || (A_LOWER <= letter && letter <= Z_LOWER) ||
(A_UPPER <= letter && letter <= Z_UPPER);
[2/2] incubator-weex git commit: Merge branch
'0.16-dev-remove-method' into 0.16-dev
Posted by ky...@apache.org.
Merge branch '0.16-dev-remove-method' into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/96c52aec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/96c52aec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/96c52aec
Branch: refs/heads/0.16-dev
Commit: 96c52aec532ee6597b1522057ba4d9dc3293c83a
Parents: 701c4b9 04180c9
Author: YorkShen <sh...@gmail.com>
Authored: Wed Sep 13 17:36:34 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Sep 13 17:36:34 2017 +0800
----------------------------------------------------------------------
.../main/java/com/taobao/weex/dom/WXStyle.java | 17 ---------
.../weex/ui/view/border/BorderCorner.java | 37 +++++++++++---------
.../taobao/weex/ui/view/border/BorderUtil.java | 26 --------------
.../weex/ui/view/border/BottomLeftCorner.java | 7 +---
.../weex/ui/view/border/BottomRightCorner.java | 7 +---
.../weex/ui/view/border/TopLeftCorner.java | 7 +---
.../weex/ui/view/border/TopRightCorner.java | 7 +---
.../com/taobao/weex/utils/FunctionParser.java | 6 ----
8 files changed, 25 insertions(+), 89 deletions(-)
----------------------------------------------------------------------