Merge remote-tracking branch 'origin/master' into AndroidX

Author: Chivorns

demojava/src/main/java/com/chivorn/demojava/MainActivity.java

@@ -34,6 +34,7 @@ private void initSpinnerInJava() {
         spProvinceNoHint.setItem(provinceList);
         spProvinceDialog.setItem(provinceList);
         spCustomColor.setItem(provinceList);
+        spCustomView.setItem(provinceList);
 
         spSearchable.setSearchDialogGravity(Gravity.TOP);
         spSearchable.setErrorTextAlignment(SmartMaterialSpinner.TextAlignment.ALIGN_LEFT);

resources/src/main/java/com/chivorn/resourcemodule/MainApp.java

@@ -24,6 +24,7 @@ public class MainApp<T> extends AppCompatActivity implements View.OnClickListene
     protected SmartMaterialSpinner<String> spProvinceDialog;
     protected SmartMaterialSpinner<String> spCustomColor;
     protected SmartMaterialSpinner<String> spEmptyItem;
+    protected SmartMaterialSpinner<String> spCustomView;
     protected SmartMaterialSpinner<String> spVisibilityChanged;
 
     private LinearLayout githubRepo;
@@ -44,6 +45,7 @@ public void initBaseView() {
         spProvinceDialog = findViewById(R.id.sp_provinces_dialog);
         spCustomColor = findViewById(R.id.sp_custom_color);
         spEmptyItem = findViewById(R.id.sp_empty_item);
+        spCustomView = findViewById(R.id.sp_custom_search_item_layout);
         spVisibilityChanged = findViewById(R.id.sp_visibility_changed);
         githubRepo = findViewById(R.id.git_repo_container);
         btnShowError = findViewById(R.id.btn_show_error);
@@ -67,6 +69,7 @@ public void initItemList() {
         provinceList.add("Kep");
         provinceList.add("Koh Kong");
         provinceList.add("Kratie");
+        provinceList.add("Some very very very very very very very very very very very very big province");
         provinceList.add("Mondulkiri");
         provinceList.add("Oddar Meanchey");
         provinceList.add("Pailin");

resources/src/main/res/layout/search_list_item_custom_layout.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:ellipsize="none"
+    android:padding="20dp"
+    android:singleLine="false" />

resources/src/main/res/layout/smart_material_spinner_sample_layout.xml

@@ -99,6 +99,19 @@
             app:smsp_floatingLabelText="floating text"
             app:smsp_hint="Empty Item Spinner" />
 
+        <TextView
+            style="@style/headerTextStyle"
+            android:text="@string/custom_search_item_layout" />
+
+        <com.chivorn.smartmaterialspinner.SmartMaterialSpinner
+            android:id="@+id/sp_custom_search_item_layout"
+            style="@style/spinnerStyle"
+            app:smsp_isSearchable="true"
+            app:smsp_searchDropdownView="@layout/search_list_item_custom_layout"
+            app:smsp_alwaysShowFloatingLabel="false"
+            app:smsp_floatingLabelText="floating text"
+            app:smsp_hint="Custom search item layout" />
+
         <TextView
             style="@style/headerTextStyle"
             android:text="@string/test_visibility_changed" />

resources/src/main/res/values/strings.xml

@@ -11,6 +11,7 @@
     <string name="dialog_spinner">Dialog Spinner</string>
     <string name="custom_color">Custom Color</string>
     <string name="clickable_spinner">Clickable Spinner</string>
+    <string name="custom_search_item_layout">Custom search item layout</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>

smartmaterialspinner/src/main/java/com/chivorn/smartmaterialspinner/SearchableSpinnerDialog.java

@@ -51,6 +51,7 @@ public class SearchableSpinnerDialog extends DialogFragment implements SearchVie
     private int headerBackgroundColor;
     private Drawable headerBackgroundDrawable;
 
+    private int searchDropdownView;
     private int searchBackgroundColor;
     private Drawable searchBackgroundDrawable;
     private int searchHintColor;
@@ -170,12 +171,12 @@ private void initSearchDialog(View rootView, Bundle savedInstanceState) {
         searchView.requestFocusFromTouch();
         List items = savedInstanceState != null ? (List) savedInstanceState.getSerializable(INSTANCE_LIST_ITEMS) : null;
         if (items != null) {
-            searchArrayAdapter = new ArrayAdapter<Object>(getActivity(), R.layout.smart_material_spinner_search_list_item_layout, items) {
+            searchArrayAdapter = new ArrayAdapter<Object>(getActivity(), searchDropdownView, items) {
                 @NonNull
                 @Override
                 public View getView(int position, View convertView, @NonNull ViewGroup parent) {
                     View listView = super.getView(position, convertView, parent);
-                    tvListItem = listView.findViewById(R.id.tv_search_list_item);
+                    tvListItem = (TextView)listView;
                     tvListItem.setTypeface(typeface);
                     if (searchListItemBackgroundColor != 0) {
                         itemListContainer.setBackgroundColor(searchListItemBackgroundColor);
@@ -368,6 +369,14 @@ public void setSearchHeaderBackgroundColor(Drawable drawable) {
         headerBackgroundColor = 0;
     }
 
+    public int getSearchDropdownView() {
+        return searchDropdownView;
+    }
+
+    public void setSearchDropdownView(int searchDropdownView) {
+        this.searchDropdownView = searchDropdownView;
+    }
+
     public void setSearchBackgroundColor(int color) {
         searchBackgroundColor = color;
         searchBackgroundDrawable = null;

smartmaterialspinner/src/main/java/com/chivorn/smartmaterialspinner/SmartMaterialSpinner.java

@@ -152,6 +152,7 @@ public class SmartMaterialSpinner<T> extends AppCompatSpinner implements Adapter
     private int searchTextColor;
     private int searchBackgroundColor;
     private Drawable searchBackgroundDrawable;
+    private int searchDropdownView;
     private float hintSize;
     private CharSequence floatingLabelText;
     private float floatingLabelSize;
@@ -303,6 +304,8 @@ private void initAttributes(Context context, AttributeSet attrs) {
             setSearchBackgroundColor(typedArray.getColor(R.styleable.SmartMaterialSpinner_smsp_searchBackgroundColor, ContextCompat.getColor(context, R.color.smsp_search_background)));
         }
 
+        searchDropdownView = typedArray.getResourceId(R.styleable.SmartMaterialSpinner_smsp_searchDropdownView, R.layout.smart_material_spinner_search_list_item_layout);
+
         //isEnableDefaultSelect = typedArray.getBoolean(R.styleable.SmartMaterialSpinner_smsp_enableDefaultSelect, true);
         isReSelectable = typedArray.getBoolean(R.styleable.SmartMaterialSpinner_smsp_isReSelectable, false);
 
@@ -330,6 +333,7 @@ private void configSearchableDialog() {
         setSelectedSearchItemColor(selectedItemListColor);
         setSearchHintColor(searchHintColor);
         setSearchTextColor(searchTextColor);
+        setSearchDropdownView(searchDropdownView);
         setSearchTypeFace(typeface);
         setSearchListItemBackgroundColor(itemListBackground);
         if (searchBackgroundColor != 0)
@@ -1433,6 +1437,13 @@ public String getSearchHint() {
         return searchHint;
     }
 
+    public void setSearchDropdownView(int viewId) {
+        if (searchableSpinnerDialog != null) {
+            searchableSpinnerDialog.setSearchDropdownView(viewId);
+        }
+        invalidate();
+    }
+
     public void setSearchBackgroundColor(int color) {
         if (searchableSpinnerDialog != null) {
             searchableSpinnerDialog.setSearchBackgroundColor(color);

smartmaterialspinner/src/main/res/values/attrs.xml

@@ -8,6 +8,7 @@
 
         <attr name="smsp_itemView" format="reference" />
         <attr name="smsp_dropdownView" format="reference" />
+        <attr name="smsp_searchDropdownView" format="reference" />
 
         <attr name="smsp_isSearchable" format="boolean" />
         <attr name="smsp_enableSearchHeader" format="boolean" />