Rearrange code

DonMat · Jul 13, 2018 · 8a7a00d · 8a7a00d
1 parent 07fa97b
commit 8a7a00d
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/searchablespinner/src/main/java/pl/utkala/searchablespinner/SearchableSpinner.kt b/searchablespinner/src/main/java/pl/utkala/searchablespinner/SearchableSpinner.kt
@@ -27,9 +27,6 @@ import android.widget.Spinner
 
 
 class SearchableSpinner : Spinner, View.OnTouchListener, OnSearchableItemClick<Any?> {
-    override fun onSearchableItemClicked(item: Any?, position: Int) {
-        setSelection(mItems.indexOf(item))
-    }
 
     private lateinit var searchDialog: SearchableSpinnerDialog
     private val mContext: Context
@@ -54,15 +51,6 @@ class SearchableSpinner : Spinner, View.OnTouchListener, OnSearchableItemClick<A
         init()
     }
 
-    private fun init() {
-        searchDialog = SearchableSpinnerDialog.getInstance(mItems)
-        searchDialog.setTitle(mDialogTitle)
-        searchDialog.setDismissText(mCloseText)
-        searchDialog.onSearchableItemClick = this
-
-        setOnTouchListener(this)
-    }
-
     override fun onTouch(v: View?, event: MotionEvent?): Boolean {
         if (searchDialog.isAdded) return true
 
@@ -80,6 +68,10 @@ class SearchableSpinner : Spinner, View.OnTouchListener, OnSearchableItemClick<A
         return true
     }
 
+    override fun onSearchableItemClicked(item: Any?, position: Int) {
+        setSelection(mItems.indexOf(item))
+    }
+
     fun setDialogTitle(title: String?) {
         mDialogTitle = title
         searchDialog.setTitle(title)
@@ -95,6 +87,15 @@ class SearchableSpinner : Spinner, View.OnTouchListener, OnSearchableItemClick<A
         searchDialog.setDismissText(dismiss, onDismissListener)
     }
 
+    private fun init() {
+        searchDialog = SearchableSpinnerDialog.getInstance(mItems)
+        searchDialog.setTitle(mDialogTitle)
+        searchDialog.setDismissText(mCloseText)
+        searchDialog.onSearchableItemClick = this
+
+        setOnTouchListener(this)
+    }
+
     private fun setAttributes(context: Context, attrs: AttributeSet) {
         val attributes = context.obtainStyledAttributes(attrs, R.styleable.SearchableSpinner)