Release v1.1.2

Chivorns · Chivorns · commit fc0743a76802 · 2019-07-05T08:04:23.000+07:00
- Fix set re-selectable not work on some device
- Fix dropdown width problem when visibility changed
diff --git a/README.md b/README.md
@@ -113,7 +113,7 @@ The best Android spinner library for your android application with more customiz
 
 ```gradle
 dependencies {
-    implementation 'com.github.chivorns:smartmaterialspinner:1.1.1'
+    implementation 'com.github.chivorns:smartmaterialspinner:1.1.2'
 }
 ```
 
diff --git a/demojava/src/main/java/com/chivorn/demojava/MainActivity.java b/demojava/src/main/java/com/chivorn/demojava/MainActivity.java
@@ -26,6 +26,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private void initSpinnerInJava() {
         spSearchable.setItem(provinceList);
+        spReSelectable.setItem(provinceList);
         spProvince.setItem(provinceList);
         spProvinceNoHint.setItem(provinceList);
         spProvinceDialog.setItem(provinceList);
@@ -39,8 +40,8 @@ private void initSpinnerInJava() {
         spCustomColor.setItemListColor(ContextCompat.getColor(this, R.color.custom_item_list_color));
 
         setOnEmptySpinnerClickListener(spEmptyItem);
-        setOnItemSelectedListener(spSearchable, spProvince, spProvinceNoHint, spProvinceDialog, spCustomColor, spEmptyItem);
-        setOnSpinnerEventListener(spSearchable, spProvince, spProvinceNoHint, spProvinceDialog, spCustomColor, spEmptyItem);
+        setOnItemSelectedListener(spSearchable, spReSelectable, spProvince, spProvinceNoHint, spProvinceDialog, spCustomColor, spEmptyItem, spVisibilityChanged);
+        setOnSpinnerEventListener(spSearchable, spReSelectable, spProvince, spProvinceNoHint, spProvinceDialog, spCustomColor, spEmptyItem);
         // setItemTextSize(90, spSearchable, spProvince, spProvinceNoHint, spProvinceDialog, spCustomColor, spEmptyItem);
         //  setErrorTextSize(90, spSearchable, spProvince, spProvinceNoHint, spProvinceDialog, spCustomColor, spEmptyItem);
         //  setSelection(3, spSearchable, spProvince, spProvinceNoHint, spProvinceDialog, spCustomColor);
@@ -54,6 +55,8 @@ private void setOnItemSelectedListener(SmartMaterialSpinner... spinners) {
                 public void onItemSelected(AdapterView<?> adapterView, View view, int position, long id) {
                     if (spinner.getId() == R.id.sp_searchable) {
                         spinner.setErrorText("Your selected item is \"" + spinner.getItem().get(position) + "\" .");
+                    } else if (spinner.getId() == R.id.sp_reselectable || spinner.getId() == R.id.sp_visibility_changed) {
+                        Toast.makeText(MainActivity.this, "Selected item is: " + spinner.getSelectedItem(), Toast.LENGTH_SHORT).show();
                     } else {
                         spinner.setErrorText("You are selecting on spinner item -> \"" + spinner.getItem().get(position) + "\" . You can show it both in XML and programmatically and you can display as single line or multiple lines");
                     }
diff --git a/resources/src/main/java/com/chivorn/resourcemodule/MainApp.java b/resources/src/main/java/com/chivorn/resourcemodule/MainApp.java
@@ -17,32 +17,38 @@ public class MainApp<T> extends AppCompatActivity implements View.OnClickListene
     private final String repoUrl = "https://github.com/Chivorns/SmartMaterialSpinner";
 
     protected SmartMaterialSpinner<String> spSearchable;
+    protected SmartMaterialSpinner<String> spReSelectable;
     protected SmartMaterialSpinner<String> spProvince;
     protected SmartMaterialSpinner<String> spProvinceNoHint;
     protected SmartMaterialSpinner<String> spProvinceDialog;
     protected SmartMaterialSpinner<String> spCustomColor;
     protected SmartMaterialSpinner<String> spEmptyItem;
+    protected SmartMaterialSpinner<String> spVisibilityChanged;
 
     private LinearLayout githubRepo;
     private Button btnShowError;
     private Button btnGotoRuntimeRender;
     private Button githubRepoBtn;
+    private Button visibilityBtn;
     protected Intent intent;
 
     protected List<String> provinceList;
     protected List<String> countryList;
 
     public void initBaseView() {
         spSearchable = findViewById(R.id.sp_searchable);
+        spReSelectable = findViewById(R.id.sp_reselectable);
         spProvince = findViewById(R.id.sp_provinces);
         spProvinceNoHint = findViewById(R.id.sp_provinces_no_hint);
         spProvinceDialog = findViewById(R.id.sp_provinces_dialog);
         spCustomColor = findViewById(R.id.sp_custom_color);
         spEmptyItem = findViewById(R.id.sp_empty_item);
+        spVisibilityChanged = findViewById(R.id.sp_visibility_changed);
         githubRepo = findViewById(R.id.git_repo_container);
         btnShowError = findViewById(R.id.btn_show_error);
         btnGotoRuntimeRender = findViewById(R.id.btn_goto_runtime_render);
         githubRepoBtn = findViewById(R.id.github_repo_btn);
+        visibilityBtn = findViewById(R.id.btn_visibility);
     }
 
     public void initItemList() {
@@ -98,6 +104,9 @@ public void onClickListener() {
         if (btnGotoRuntimeRender != null) {
             btnGotoRuntimeRender.setOnClickListener(this);
         }
+        if (visibilityBtn != null) {
+            visibilityBtn.setOnClickListener(this);
+        }
     }
 
     @Override
@@ -112,6 +121,15 @@ public void onClick(View v) {
             spProvinceNoHint.setErrorText(getResources().getString(R.string.sample_error_message));
             spProvinceDialog.setErrorText(getResources().getString(R.string.sample_error_message));
             spCustomColor.setErrorText(getResources().getString(R.string.sample_error_message));
+        } else if (v.getId() == R.id.btn_visibility) {
+            if (spVisibilityChanged.getVisibility() == View.VISIBLE) {
+                spVisibilityChanged.setVisibility(View.GONE);
+                visibilityBtn.setText(getResources().getString(R.string.show_spinner));
+            } else {
+                spVisibilityChanged.setVisibility(View.VISIBLE);
+                visibilityBtn.setText(getResources().getString(R.string.hide_spinner));
+                spVisibilityChanged.setItem(provinceList);
+            }
         }
     }
 }
diff --git a/resources/src/main/res/layout/smart_material_spinner_sample_layout.xml b/resources/src/main/res/layout/smart_material_spinner_sample_layout.xml
@@ -26,6 +26,17 @@
             app:smsp_searchHeaderText="Search/Select Province"
             app:smsp_searchHeaderTextColor="#ffff" />
 
+        <TextView
+            style="@style/headerTextStyle"
+            android:text="Re-Selectable Spinner" />
+
+        <com.chivorn.smartmaterialspinner.SmartMaterialSpinner
+            android:id="@+id/sp_reselectable"
+            style="@style/spinnerStyle"
+            app:smsp_errorText="@string/sample_error_message"
+            app:smsp_hint="Re-Selectable Spinner"
+            app:smsp_isReSelectable="true" />
+
         <TextView
             style="@style/headerTextStyle"
             android:text="@string/dropdown_spinner" />
@@ -35,7 +46,6 @@
             style="@style/spinnerStyle"
             app:smsp_errorText="@string/sample_error_message"
             app:smsp_hint="Province (Dropdown Mode)"
-            app:smsp_isReSelectable="true"
             app:smsp_multilineError="false" />
 
         <com.chivorn.smartmaterialspinner.SmartMaterialSpinner
@@ -84,6 +94,17 @@
             app:smsp_floatingLabelText="floating text"
             app:smsp_hint="Empty Item Spinner" />
 
+        <TextView
+            style="@style/headerTextStyle"
+            android:text="@string/test_visibility_changed" />
+
+        <com.chivorn.smartmaterialspinner.SmartMaterialSpinner
+            android:id="@+id/sp_visibility_changed"
+            style="@style/spinnerStyle"
+            android:visibility="gone"
+            app:smsp_hint="Test Visibility Changed and Re-Selectable"
+            app:smsp_isReSelectable="true" />
+
         <Button
             android:id="@+id/btn_show_error"
             android:layout_width="wrap_content"
@@ -98,6 +119,20 @@
             android:textAllCaps="false"
             android:textColor="@color/smsp_white_color" />
 
+        <Button
+            android:id="@+id/btn_visibility"
+            android:layout_width="wrap_content"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:layout_marginTop="10dp"
+            android:layout_marginEnd="5dp"
+            android:layout_marginRight="5dp"
+            android:background="#6194EB"
+            android:padding="10dp"
+            android:text="@string/show_spinner"
+            android:textAllCaps="false"
+            android:textColor="@color/smsp_white_color" />
+
         <Button
             android:id="@+id/btn_goto_runtime_render"
             android:layout_width="wrap_content"
diff --git a/resources/src/main/res/values/strings.xml b/resources/src/main/res/values/strings.xml
@@ -12,4 +12,7 @@
     <string name="custom_color">Custom Color</string>
     <string name="clickable_spinner">Clickable Spinner</string>
     <string name="goto_runtime_render">Goto Runtime Render</string>
+    <string name="test_visibility_changed">Test Visibility Changed</string>
+    <string name="show_spinner">Show Spinner</string>
+    <string name="hide_spinner">Hide Spinner</string>
 </resources>
diff --git a/smartmaterialspinner/build.gradle b/smartmaterialspinner/build.gradle
@@ -5,7 +5,7 @@ ext {
     LIBRARY_NAME = 'SmartMaterialSpinner'
     PUBLISH_GROUP_ID = 'com.github.chivorns'
     PUBLISH_ARTIFACT_ID = LIBRARY_NAME.toLowerCase()
-    PUBLISH_VERSION = '1.1.1'
+    PUBLISH_VERSION = '1.1.2'
 
     // Bintray
     BINTRAY_REPO = 'maven'
@@ -32,7 +32,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 16
+        versionCode 17
         versionName "$PUBLISH_VERSION"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
diff --git a/smartmaterialspinner/src/main/java/com/chivorn/smartmaterialspinner/SmartMaterialSpinner.java b/smartmaterialspinner/src/main/java/com/chivorn/smartmaterialspinner/SmartMaterialSpinner.java
@@ -310,7 +310,7 @@ public void onGlobalLayout() {
                 if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
                     SmartMaterialSpinner.this.getViewTreeObserver().removeOnGlobalLayoutListener(this);
                 }
-                if (getWidth() != 0 && getHeight() != 0 && getDropDownWidth() != 0) {
+                if (getWidth() != 0 && getHeight() != 0) {
                     SmartMaterialSpinner.this.setDropDownWidth(getWidth());
                     SmartMaterialSpinner.this.setDropDownVerticalOffset(getHeight());
                 }
@@ -791,14 +791,12 @@ public void setSelection(int position) {
         if (isShowing && !isSearchable && hint != null) {
             position -= 1;
         }
-        if (isReSelectable) {
-            ignoreOldSelectionByReflection();
-        }
         final int finalPosition = position;
         this.post(new Runnable() {
             @Override
             public void run() {
                 SmartMaterialSpinner.super.setSelection(hint != null ? finalPosition + 1 : finalPosition);
+                checkReSelectable(finalPosition);
             }
         });
     }
@@ -808,11 +806,9 @@ public void setSelection(int position, boolean animate) {
         if (isShowing && !isSearchable && hint != null) {
             position -= 1;
         }
-        if (isReSelectable) {
-            ignoreOldSelectionByReflection();
-        }
         final int finalPosition = position;
         super.setSelection(hint != null ? finalPosition + 1 : finalPosition, animate);
+        checkReSelectable(finalPosition);
     }
 
     public void clearSelection() {
@@ -824,7 +820,7 @@ public void setSelected(boolean selected) {
         isSelected = selected;
     }
 
-    private boolean ignoreOldSelectionByReflection() {
+    private boolean clearOldSelectedPosition() {
         try {
             Class<?> c = this.getClass().getSuperclass().getSuperclass().getSuperclass().getSuperclass();
             Field reqField = c.getDeclaredField("mOldSelectedPosition");
@@ -836,6 +832,12 @@ private boolean ignoreOldSelectionByReflection() {
         return false;
     }
 
+    private void checkReSelectable(int position) {
+        if (position == getSelectedItemPosition() && lastPosition != -1 && isReSelectable && onItemSelectedListener != null) {
+            onItemSelectedListener.onItemSelected(this, getSelectedView(), position, getSelectedItemId());
+        }
+    }
+
     @Override
     public void onAnimationUpdate(ValueAnimator animation) {
         invalidate();

Original file line number	Diff line number	Diff line change
`@@ -113,7 +113,7 @@ The best Android spinner library for your android application with more customiz`
`113`	`113`
`114`	`114`	```gradle
`115`	`115`	`dependencies {`
`116`		`- implementation 'com.github.chivorns:smartmaterialspinner:1.1.1'`
	`116`	`+ implementation 'com.github.chivorns:smartmaterialspinner:1.1.2'`
`117`	`117`	`}`
`118`	`118`	```
`119`	`119`