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/06/28 08:48:16 UTC
[1/5] incubator-weex git commit: * [android] Add RAW and None for
imageQuality
Repository: incubator-weex
Updated Branches:
refs/heads/0.15-dev 571b735ac -> e4ba34646
* [android] Add RAW and None for imageQuality
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/2c248325
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/2c248325
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/2c248325
Branch: refs/heads/0.15-dev
Commit: 2c248325d808cf3780c96a2d1dafbe2cd4a86038
Parents: b549a22
Author: YorkShen <sh...@gmail.com>
Authored: Wed Jun 14 17:39:42 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Mon Jun 26 17:14:46 2017 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/common/Constants.java | 1 +
.../com/taobao/weex/common/WXImageStrategy.java | 9 ++++-
.../main/java/com/taobao/weex/dom/WXAttr.java | 38 ++++++++------------
.../com/taobao/weex/dom/WXImageQuality.java | 6 +++-
4 files changed, 28 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c248325/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index f683c99..3da084c 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -199,6 +199,7 @@ public class Constants {
String LOW = "low";
String NORMAL = "normal";
String HIGH = "high";
+ String RAW = "raw";
String VISIBLE = "visible";
String HIDDEN = "hidden";
String TEXT = "text";
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c248325/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java b/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java
index 74d06b0..994c99b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/WXImageStrategy.java
@@ -24,9 +24,16 @@ import java.util.Map;
public class WXImageStrategy {
+
/**
- * Whether to clip image. The default value is false.
+ * <strong>Never!</strong>
+ * <strong>Never!</strong>
+ * <strong>Never!</strong>
+ * Never use this flag, ImageView has done all the job of clipping!
+ * There is no method to read this flag any more.
+ * This field will be removed when it's appropriate.
*/
+ @Deprecated
public boolean isClipping;
/**
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c248325/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
index 05e1626..d143dac 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
@@ -18,23 +18,23 @@
*/
package com.taobao.weex.dom;
+import static java.lang.Boolean.parseBoolean;
+
import android.support.annotation.NonNull;
import android.support.v4.util.ArrayMap;
import android.text.TextUtils;
-
import com.taobao.weex.common.Constants;
+import com.taobao.weex.common.Constants.Name;
import com.taobao.weex.common.WXImageSharpen;
import com.taobao.weex.ui.view.listview.WXRecyclerView;
import com.taobao.weex.utils.WXLogUtils;
import com.taobao.weex.utils.WXUtils;
import com.taobao.weex.utils.WXViewUtils;
-
import java.util.Collection;
+import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import static java.lang.Boolean.parseBoolean;
-
/**
* store value of component attribute
*
@@ -95,27 +95,17 @@ public class WXAttr implements Map<String, Object>,Cloneable {
}
public WXImageQuality getImageQuality() {
-
- Object obj = get(Constants.Name.QUALITY);
- if (obj == null) {
- obj = get(Constants.Name.IMAGE_QUALITY);
- }
- if (obj == null) {
- return WXImageQuality.LOW;
- }
- WXImageQuality waImageQuality = WXImageQuality.LOW;
- String imageQuality = obj.toString();
- if (imageQuality.equals(Constants.Value.ORIGINAL)) {
- waImageQuality = WXImageQuality.ORIGINAL;
- } else if (imageQuality.equals(Constants.Value.LOW)) {
- waImageQuality = WXImageQuality.LOW;
- } else if (imageQuality.equals(Constants.Value.NORMAL)) {
- waImageQuality = WXImageQuality.NORMAL;
- } else if (imageQuality.equals(Constants.Value.HIGH)) {
- waImageQuality = WXImageQuality.HIGH;
+ Object obj = containsKey(Name.QUALITY) ? get(Name.QUALITY) : get(Name.IMAGE_QUALITY);
+ WXImageQuality imageQuality = WXImageQuality.NONE;
+ String value;
+ if (obj != null && !TextUtils.isEmpty(value = obj.toString())) {
+ try {
+ imageQuality = WXImageQuality.valueOf(value.toUpperCase(Locale.US));
+ }catch (IllegalArgumentException e){
+ WXLogUtils.e("Image", "Invalid value image quality. Only low, normal, high, original are valid");
+ }
}
-
- return waImageQuality;
+ return imageQuality;
}
public WXImageSharpen getImageSharpen() {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/2c248325/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
index 20771d9..488f84a 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
@@ -26,5 +26,9 @@ public enum WXImageQuality {
NORMAL,
- HIGH
+ HIGH,
+
+ RAW,
+
+ NONE
}
[4/5] incubator-weex git commit: * [android] Remove raw
Posted by ky...@apache.org.
* [android] Remove raw
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/df3f9034
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/df3f9034
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/df3f9034
Branch: refs/heads/0.15-dev
Commit: df3f903417386cb1ec31ccaa42632e211625db26
Parents: 5b1cf38
Author: YorkShen <sh...@gmail.com>
Authored: Wed Jun 28 15:32:44 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Jun 28 15:32:44 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/common/Constants.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/df3f9034/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
index 3da084c..f683c99 100644
--- a/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
+++ b/android/sdk/src/main/java/com/taobao/weex/common/Constants.java
@@ -199,7 +199,6 @@ public class Constants {
String LOW = "low";
String NORMAL = "normal";
String HIGH = "high";
- String RAW = "raw";
String VISIBLE = "visible";
String HIDDEN = "hidden";
String TEXT = "text";
[2/5] incubator-weex git commit: - [android] Remove Raw from
imageQuality
Posted by ky...@apache.org.
- [android] Remove Raw from imageQuality
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/ddc9c3d1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/ddc9c3d1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/ddc9c3d1
Branch: refs/heads/0.15-dev
Commit: ddc9c3d18dcf4593e8e4eab76084ed9078229c0a
Parents: 2c24832
Author: YorkShen <sh...@gmail.com>
Authored: Tue Jun 27 15:57:20 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Tue Jun 27 15:57:20 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java | 2 --
1 file changed, 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/ddc9c3d1/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
index 488f84a..e580605 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
@@ -28,7 +28,5 @@ public enum WXImageQuality {
HIGH,
- RAW,
-
NONE
}
[5/5] incubator-weex git commit: Merge branch 'android-imageQuality'
of https://github.com/YorkShen/incubator-weex into 0.15-dev
Posted by ky...@apache.org.
Merge branch 'android-imageQuality' of https://github.com/YorkShen/incubator-weex into 0.15-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/e4ba3464
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e4ba3464
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e4ba3464
Branch: refs/heads/0.15-dev
Commit: e4ba34646eba77aad46d3d6e0fffb0602ea01d41
Parents: 571b735 df3f903
Author: YorkShen <sh...@gmail.com>
Authored: Wed Jun 28 16:47:34 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Jun 28 16:47:34 2017 +0800
----------------------------------------------------------------------
.../com/taobao/weex/common/WXImageStrategy.java | 9 ++++-
.../main/java/com/taobao/weex/dom/WXAttr.java | 38 ++++++++------------
.../com/taobao/weex/dom/WXImageQuality.java | 4 ++-
3 files changed, 25 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
[3/5] incubator-weex git commit: * [android] Change the default value
of img quality.
Posted by ky...@apache.org.
* [android] Change the default value of img quality.
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5b1cf385
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5b1cf385
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5b1cf385
Branch: refs/heads/0.15-dev
Commit: 5b1cf3854b3bc4bea9ec7b4a3beca634073e38df
Parents: ddc9c3d
Author: YorkShen <sh...@gmail.com>
Authored: Wed Jun 28 15:26:48 2017 +0800
Committer: YorkShen <sh...@gmail.com>
Committed: Wed Jun 28 15:26:48 2017 +0800
----------------------------------------------------------------------
android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java | 2 +-
android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b1cf385/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
index d143dac..31ac09b 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
@@ -96,7 +96,7 @@ public class WXAttr implements Map<String, Object>,Cloneable {
public WXImageQuality getImageQuality() {
Object obj = containsKey(Name.QUALITY) ? get(Name.QUALITY) : get(Name.IMAGE_QUALITY);
- WXImageQuality imageQuality = WXImageQuality.NONE;
+ WXImageQuality imageQuality = WXImageQuality.AUTO;
String value;
if (obj != null && !TextUtils.isEmpty(value = obj.toString())) {
try {
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5b1cf385/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java b/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
index e580605..6cce8f4 100644
--- a/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
+++ b/android/sdk/src/main/java/com/taobao/weex/dom/WXImageQuality.java
@@ -28,5 +28,5 @@ public enum WXImageQuality {
HIGH,
- NONE
+ AUTO
}