You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ac...@apache.org on 2018/04/01 13:16:05 UTC
[1/2] incubator-weex git commit: + [android] switch component
supports setting color
Repository: incubator-weex
Updated Branches:
refs/heads/master 808c818a0 -> 3222071d6
+ [android] switch component supports setting color
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8255eda6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8255eda6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8255eda6
Branch: refs/heads/master
Commit: 8255eda611e80bb75048476c3743f52fc41f4213
Parents: f27bf04
Author: 南麓 <ha...@alibaba-inc.com>
Authored: Mon Mar 26 14:05:32 2018 +0800
Committer: 南麓 <ha...@alibaba-inc.com>
Committed: Mon Mar 26 14:05:32 2018 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/common/Constants.java | 6 ++--
.../com/taobao/weex/ui/component/WXSwitch.java | 29 +++++++++++++++-
.../com/taobao/weex/ui/view/WXSwitchView.java | 35 ++++++++++++++++++++
3 files changed, 67 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8255eda6/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 4873f1f..e35fc65 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
@@ -207,8 +207,10 @@ public class Constants {
String INCLUDE_FONT_PADDING = "includeFontPadding";
String ENABLE_COPY = "enableCopy";
-
-
+ String THUMB_TINT_COLOR = "thumbTintColor";
+ String ON_THUMB_TINT_COLOR = "onThumbTintColor";
+ String TINT_COLOR = "tintColor";
+ String ON_TINT_COLOR = "onTintColor";
interface Recycler{
String LIST_DATA = "listData";
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8255eda6/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java
index 7893440..27e4c95 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/component/WXSwitch.java
@@ -23,7 +23,6 @@ import android.support.annotation.NonNull;
import android.widget.CompoundButton;
import com.taobao.weex.WXSDKInstance;
-import com.taobao.weex.WXSDKManager;
import com.taobao.weex.annotation.Component;
import com.taobao.weex.common.Constants;
import com.taobao.weex.dom.WXDomObject;
@@ -38,6 +37,10 @@ import java.util.Map;
public class WXSwitch extends WXComponent<WXSwitchView> {
private CompoundButton.OnCheckedChangeListener mListener;
+ private String mTrackTintColorNormal;
+ private String mTrackTintColorActivated;
+ private String mThumbTintColorNormal;
+ private String mThumbTintColorActivated;
@Deprecated
public WXSwitch(WXSDKInstance instance, WXDomObject dom, WXVContainer parent, String instanceId, boolean isLazy) {
@@ -94,6 +97,22 @@ public class WXSwitch extends WXComponent<WXSwitchView> {
setChecked(result);
}
return true;
+ case Constants.Name.THUMB_TINT_COLOR:
+ mThumbTintColorNormal = WXUtils.getString(param, null);
+ setThumbColor();
+ return true;
+ case Constants.Name.ON_THUMB_TINT_COLOR:
+ mThumbTintColorActivated = WXUtils.getString(param, null);
+ setThumbColor();
+ return true;
+ case Constants.Name.TINT_COLOR:
+ mTrackTintColorNormal = WXUtils.getString(param, null);
+ setTrackColor();
+ return true;
+ case Constants.Name.ON_TINT_COLOR:
+ mTrackTintColorActivated = WXUtils.getString(param, null);
+ setTrackColor();
+ return true;
}
return super.setProperty(key, param);
}
@@ -104,4 +123,12 @@ public class WXSwitch extends WXComponent<WXSwitchView> {
getHostView().setChecked(checked);
getHostView().setOnCheckedChangeListener(mListener);
}
+
+ private void setThumbColor() {
+ getHostView().setThumbColor(mThumbTintColorNormal, mThumbTintColorActivated);
+ }
+
+ private void setTrackColor() {
+ getHostView().setTrackColor(mTrackTintColorNormal, mTrackTintColorActivated);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8255eda6/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java
----------------------------------------------------------------------
diff --git a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java
index fc96a7d..9568b23 100644
--- a/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java
+++ b/android/sdk/src/main/java/com/taobao/weex/ui/view/WXSwitchView.java
@@ -19,21 +19,32 @@
package com.taobao.weex.ui.view;
import android.content.Context;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
import android.support.v7.widget.SwitchCompat;
import android.view.Gravity;
import android.view.MotionEvent;
import com.taobao.weex.ui.view.gesture.WXGesture;
import com.taobao.weex.ui.view.gesture.WXGestureObservable;
+import com.taobao.weex.utils.WXResourceUtils;
public class WXSwitchView extends SwitchCompat implements WXGestureObservable {
+ static final String TRACK_TINT_COLOR_NORMAL = "#b9b8b8";
+ static final String TRACK_TINT_COLOR_ACTIVATED = "#fb97bd";
+ static final String TRACK_TINT_COLOR_DISABLED = "#42b9b8b8";
+ static final String THUMB_TINT_COLOR_NORMAL = "#f1f1f1";
+ static final String THUMB_TINT_COLOR_ACTIVATED = "#fc4482";
+ static final String THUMB_TINT_COLOR_DISABLED = "#42f1f1f1";
+
private WXGesture wxGesture;
public WXSwitchView(Context context) {
super(context);
setShowText(false);
setGravity(Gravity.CENTER_VERTICAL);
+ setBackgroundColor(Color.TRANSPARENT);
}
@Override
@@ -49,4 +60,28 @@ public class WXSwitchView extends SwitchCompat implements WXGestureObservable {
}
return result;
}
+
+ public void setThumbColor(String thumbTintColorNormal, String thumbTintColorActivated) {
+ setThumbTintList(new ColorStateList(new int[][]{
+ new int[]{-android.R.attr.state_enabled},
+ new int[]{-android.R.attr.state_checked},
+ new int[]{android.R.attr.state_checked}
+ }, new int[]{
+ WXResourceUtils.getColor(THUMB_TINT_COLOR_DISABLED, Color.parseColor(THUMB_TINT_COLOR_DISABLED)),
+ WXResourceUtils.getColor(thumbTintColorNormal, Color.parseColor(THUMB_TINT_COLOR_NORMAL)),
+ WXResourceUtils.getColor(thumbTintColorActivated, Color.parseColor(THUMB_TINT_COLOR_ACTIVATED))
+ }));
+ }
+
+ public void setTrackColor(String trackTintColorNormal, String trackTintColorActivated) {
+ setTrackTintList(new ColorStateList(new int[][]{
+ new int[]{-android.R.attr.state_enabled},
+ new int[]{-android.R.attr.state_checked},
+ new int[]{android.R.attr.state_checked}
+ }, new int[]{
+ WXResourceUtils.getColor(TRACK_TINT_COLOR_DISABLED, Color.parseColor(TRACK_TINT_COLOR_DISABLED)),
+ WXResourceUtils.getColor(trackTintColorNormal, Color.parseColor(TRACK_TINT_COLOR_NORMAL)),
+ WXResourceUtils.getColor(trackTintColorActivated, Color.parseColor(TRACK_TINT_COLOR_ACTIVATED))
+ }));
+ }
}
[2/2] incubator-weex git commit: Merge branch
'android-feature-switch' of https://github.com/whn9527/incubator-weex into
merge-pull-request-master
Posted by ac...@apache.org.
Merge branch 'android-feature-switch' of https://github.com/whn9527/incubator-weex into merge-pull-request-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/3222071d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/3222071d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/3222071d
Branch: refs/heads/master
Commit: 3222071d6e2e37c6b21a22f6fc14eb711f528be9
Parents: 808c818 8255eda
Author: acton393 <zh...@gmail.com>
Authored: Sun Apr 1 21:15:12 2018 +0800
Committer: acton393 <zh...@gmail.com>
Committed: Sun Apr 1 21:15:12 2018 +0800
----------------------------------------------------------------------
.../java/com/taobao/weex/common/Constants.java | 6 ++--
.../com/taobao/weex/ui/component/WXSwitch.java | 29 +++++++++++++++-
.../com/taobao/weex/ui/view/WXSwitchView.java | 35 ++++++++++++++++++++
3 files changed, 67 insertions(+), 3 deletions(-)
----------------------------------------------------------------------