support minSdkVersion 7

fixed #4
Lesilva · Apr 10, 2015 · f0f5416 · f0f5416
1 parent e92b786
commit f0f5416
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,7 +6,7 @@ android {
 
     defaultConfig {
         applicationId "com.weiwangcn.betterspinner.sample"
-        minSdkVersion 15
+        minSdkVersion 7
         targetSdkVersion 22
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=1.0.4
-VERSION_CODE=104
+VERSION_NAME=1.0.5
+VERSION_CODE=105
 GROUP=com.weiwangcn.betterspinner
 
 POM_DESCRIPTION=Android Spinner in a Better Design

diff --git a/library-material/build.gradle b/library-material/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "22.0.0"
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 7
         targetSdkVersion 22
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)

diff --git a/...ial/src/main/java/com/weiwangcn/betterspinner/library/material/MaterialBetterSpinner.java b/...ial/src/main/java/com/weiwangcn/betterspinner/library/material/MaterialBetterSpinner.java
@@ -17,6 +17,7 @@ public class MaterialBetterSpinner extends MaterialAutoCompleteTextView {
 
     private static final int MAX_CLICK_DURATION = 200;
     private long startClickTime;
+    private boolean isPopup;
 
     public MaterialBetterSpinner(Context context) {
         super(context);
@@ -59,8 +60,14 @@ public boolean onTouchEvent(MotionEvent event) {
             case MotionEvent.ACTION_UP: {
                 long clickDuration = Calendar.getInstance().getTimeInMillis() - startClickTime;
                 if (clickDuration < MAX_CLICK_DURATION) {
-                    requestFocus();
-                    showDropDown();
+                    if (isPopup) {
+                        dismissDropDown();
+                        isPopup = false;
+                    } else {
+                        requestFocus();
+                        showDropDown();
+                        isPopup = true;
+                    }
                 }
             }
         }

diff --git a/library/build.gradle b/library/build.gradle
@@ -5,7 +5,7 @@ android {
     buildToolsVersion "21.1.2"
 
     defaultConfig {
-        minSdkVersion 15
+        minSdkVersion 7
         targetSdkVersion 22
         versionName project.VERSION_NAME
         versionCode Integer.parseInt(project.VERSION_CODE)

diff --git a/library/src/main/java/com/weiwangcn/betterspinner/library/BetterSpinner.java b/library/src/main/java/com/weiwangcn/betterspinner/library/BetterSpinner.java
@@ -16,6 +16,7 @@ public class BetterSpinner extends AutoCompleteTextView {
 
     private static final int MAX_CLICK_DURATION = 200;
     private long startClickTime;
+    private boolean isPopup;
 
     public BetterSpinner(Context context) {
         super(context);
@@ -58,8 +59,14 @@ public boolean onTouchEvent(MotionEvent event) {
             case MotionEvent.ACTION_UP: {
                 long clickDuration = Calendar.getInstance().getTimeInMillis() - startClickTime;
                 if (clickDuration < MAX_CLICK_DURATION) {
-                    requestFocus();
-                    showDropDown();
+                    if (isPopup) {
+                        dismissDropDown();
+                        isPopup = false;
+                    } else {
+                        requestFocus();
+                        showDropDown();
+                        isPopup = true;
+                    }
                 }
             }
         }