Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

+ [android] Change the default value of imageQuality #478

Merged
merged 4 commits into from
Jun 28, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,16 @@

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;

/**
Expand Down
38 changes: 14 additions & 24 deletions android/sdk/src/main/java/com/taobao/weex/dom/WXAttr.java
Original file line number Diff line number Diff line change
Expand Up @@ -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
*
Expand Down Expand Up @@ -95,27 +95,17 @@ public static String getValue(Map<String, Object> attr) {
}

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.AUTO;
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() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,7 @@ public enum WXImageQuality {

NORMAL,

HIGH
HIGH,

AUTO
}