Modify isSelected conflict

sadra · Jun 6, 2017 · 2f2e4e0 · 2f2e4e0
1 parent 111937e
commit 2f2e4e0
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/AwesomeSpinner/build.gradle b/AwesomeSpinner/build.gradle
@@ -8,7 +8,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.8"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 

diff --git a/AwesomeSpinner/src/main/java/com/isapanah/awesomespinner/AwesomeSpinner.java b/AwesomeSpinner/src/main/java/com/isapanah/awesomespinner/AwesomeSpinner.java
@@ -108,16 +108,17 @@ private void initiateSpinnerString(){
         _spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+
                 Log.d(TAG, "position selected: " + position);
                 if (AwesomeSpinner.this._callback == null) {
                     throw new IllegalStateException("callback cannot be null");
                 }
                 if(_allowToSelect){
+                    _isSelected = true;
                     Object item = AwesomeSpinner.this._spinner.getItemAtPosition(position);
                     AwesomeSpinner.this._callback.onItemSelected(position, (String) item);
                     _hintButton.setText(_spinner.getSelectedItem().toString());
                     _hintButton.setTextColor(Color.BLACK);
-                    _isSelected = true;
                 }
                 _allowToSelect = true;
 
@@ -141,16 +142,17 @@ private void initiateSpinnerCharSequence(){
         _spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
             @Override
             public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+
                 Log.d(TAG, "position selected: " + position);
                 if (AwesomeSpinner.this._callback == null) {
                     throw new IllegalStateException("callback cannot be null");
                 }
                 if(_allowToSelect){
+                    _isSelected = true;
                     Object item = AwesomeSpinner.this._spinner.getItemAtPosition(position);
                     AwesomeSpinner.this._callback.onItemSelected(position, (String) item);
                     _hintButton.setText(_spinner.getSelectedItem().toString());
                     _hintButton.setTextColor(Color.BLACK);
-                    _isSelected = true;
                 }
                 _allowToSelect = true;
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -14,7 +14,7 @@ android {
         minSdkVersion 14
         targetSdkVersion 25
         versionCode 1
-        versionName "1.0"
+        versionName "1.0.8"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -30,7 +30,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.github.amlashi-sadra:AwesomeSpinner:1.0.7'
     compile 'com.android.support:design:25.3.1'
     testCompile 'junit:junit:4.12'
+    compile project(':AwesomeSpinner')
 }
diff --git a/app/src/main/java/com/isapanah/awsomespinnerexample/MainActivity.java b/app/src/main/java/com/isapanah/awsomespinnerexample/MainActivity.java
@@ -38,7 +38,7 @@ protected void onCreate(Bundle savedInstanceState) {
         spinnerRTL.setOnSpinnerItemClickListener(new AwesomeSpinner.onSpinnerItemClickListener<String>() {
             @Override
             public void onItemSelected(int position, String itemAtPosition) {
-                Toast.makeText(getApplicationContext(), "Position: "+position+" | Item: "+itemAtPosition, Toast.LENGTH_LONG).show();
+                Toast.makeText(getApplicationContext(), "Position: "+position+" | Item: "+itemAtPosition+" | isSelected:"+spinnerLTR.isSelected(), Toast.LENGTH_LONG).show();
             }
         });
 
@@ -57,7 +57,7 @@ public void onItemSelected(int position, String itemAtPosition) {
         spinnerLTR.setOnSpinnerItemClickListener(new AwesomeSpinner.onSpinnerItemClickListener<String>() {
             @Override
             public void onItemSelected(int position, String itemAtPosition) {
-                Toast.makeText(getApplicationContext(), "Position: "+position+" | Item: "+itemAtPosition, Toast.LENGTH_LONG).show();
+                Toast.makeText(getApplicationContext(), "Position: "+position+" | Item: "+itemAtPosition+" | isSelected:"+spinnerLTR.isSelected(), Toast.LENGTH_LONG).show();
             }
         });