1.1.1

kyleduo · kyleduo · commit 19fce579e256 · 2015-12-23T20:57:59.000+08:00
diff --git a/README.md b/README.md
@@ -7,13 +7,13 @@ Use with Gradle:
 
 ```
 dependencies {
-  compile 'com.lantouzi.wheelview:library:1.1.0'
+  compile 'com.lantouzi.wheelview:library:1.1.1'
 }
 ```
 
 Screenshot of Demo:
 ---
-![Demo](https://raw.githubusercontent.com/lantouzi/WheelView-Android/master/preview/demo.jpg)
+![Demo](https://raw.githubusercontent.com/lantouzi/WheelView-Android/master/preview/demo.png)
 
 Usage
 ---
@@ -43,7 +43,7 @@ public interface OnWheelItemSelectedListener {
 
 
 ### Limit scope of selection.
-*(Added in 1.1.0)*
+*(Added in 1.1.1)*
 
 * **setMinSelectableIndex/setMaxSelectableIndex** limit min/max index whitch is selectable in code.
 
diff --git a/demo/build.gradle b/demo/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.lantouzi.wheelview.demo"
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 1
-        versionName "1.0"
+        versionCode 4
+        versionName "1.1.0"
     }
     buildTypes {
         release {
diff --git a/demo/demo.iml b/demo/demo.iml
@@ -65,13 +65,19 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/debug" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
diff --git a/demo/src/main/java/com/lantouzi/wheelview/demo/MainActivity.java b/demo/src/main/java/com/lantouzi/wheelview/demo/MainActivity.java
@@ -71,6 +71,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		mWheelView3.setAdditionCenterMark("m");
 
 		mWheelView4.setItems(items);
+		mWheelView4.setEnabled(false);
 
 		mWheelView5.setItems(items);
 		mWheelView5.setMinSelectableIndex(3);
diff --git a/library/build.gradle b/library/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 // This is the library version used when deploying the artifact
-version = "1.1.0"
+version = "1.1.1"
 
 android {
     compileSdkVersion 23
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion 11
         targetSdkVersion 23
-        versionCode 3
-        versionName "1.1.0"
+        versionCode 4
+        versionName "1.1.1"
     }
     buildTypes {
         release {
diff --git a/library/library.iml b/library/library.iml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.lantouzi.wheelview" external.system.module.version="1.1.0" type="JAVA_MODULE" version="4">
+<module external.linked.project.id=":library" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="com.lantouzi.wheelview" external.system.module.version="1.1.1" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="android-gradle" name="Android-Gradle">
       <configuration>
diff --git a/library/src/main/java/com/lantouzi/wheelview/WheelView.java b/library/src/main/java/com/lantouzi/wheelview/WheelView.java
@@ -316,7 +316,7 @@ protected void onDraw(Canvas canvas) {
 
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
-		if (mItems == null || mItems.size() == 0) {
+		if (mItems == null || mItems.size() == 0 || !isEnabled()) {
 			return false;
 		}
 		boolean ret = mGestureDetectorCompat.onTouchEvent(event);
diff --git a/preview/demo.jpg b/preview/demo.jpg
diff --git a/preview/demo.png b/preview/demo.png

Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ protected void onDraw(Canvas canvas) {`
`316`	`316`
`317`	`317`	`@Override`
`318`	`318`	`public boolean onTouchEvent(MotionEvent event) {`
`319`		`- if (mItems == null \|\| mItems.size() == 0) {`
	`319`	`+ if (mItems == null \|\| mItems.size() == 0 \|\| !isEnabled()) {`
`320`	`320`	`return false;`
`321`	`321`	`}`
`322`	`322`	`boolean ret = mGestureDetectorCompat.onTouchEvent(event);`