Minor refactoring

app/src/main/java/com/paktalin/vocabularynotebook/Holder.kt → app/src/main/java/com/paktalin/vocabularynotebook/ViewHolder.kt

@@ -7,7 +7,7 @@ import android.widget.TextView
 import com.paktalin.vocabularynotebook.firestoreitems.WordItem
 import com.paktalin.vocabularynotebook.firestoreitems.WordItem
 import kotlinx.android.synthetic.main.word_item.view.*
 import kotlinx.android.synthetic.main.word_item.view.*
 
 
-class Holder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
     private val tvWord: TextView = itemView.word
     private val tvWord: TextView = itemView.word
     private val tvTranslation: TextView = itemView.translation
     private val tvTranslation: TextView = itemView.translation
     val layout: LinearLayout = itemView.layout
     val layout: LinearLayout = itemView.layout

app/src/main/java/com/paktalin/vocabularynotebook/VocabularyAdapter.kt

@@ -6,15 +6,12 @@ import android.os.Bundle
 import android.support.v7.widget.PopupMenu
 import android.support.v7.widget.PopupMenu
 import android.support.v7.widget.RecyclerView
 import android.support.v7.widget.RecyclerView
 import android.view.*
 import android.view.*
-import android.widget.LinearLayout
-import android.widget.TextView
 import com.paktalin.vocabularynotebook.firestoreitems.WordItem
 import com.paktalin.vocabularynotebook.firestoreitems.WordItem
 import com.paktalin.vocabularynotebook.ui.fragments.EditWordFragment
 import com.paktalin.vocabularynotebook.ui.fragments.EditWordFragment
 import com.paktalin.vocabularynotebook.ui.activities.MainActivity
 import com.paktalin.vocabularynotebook.ui.activities.MainActivity
 import com.paktalin.vocabularynotebook.utils.addFragment
 import com.paktalin.vocabularynotebook.utils.addFragment
-import kotlinx.android.synthetic.main.word_item.view.*
 
 
-class VocabularyAdapter(private val fullVocabulary: Vocabulary, private val mainActivity: MainActivity) : RecyclerView.Adapter<Holder>() {
+class VocabularyAdapter(private val fullVocabulary: Vocabulary, private val mainActivity: MainActivity) : RecyclerView.Adapter<ViewHolder>() {
 
 
     private var displayedVocabulary = Vocabulary(fullVocabulary)
     private var displayedVocabulary = Vocabulary(fullVocabulary)
     private lateinit var recyclerView: RecyclerView
     private lateinit var recyclerView: RecyclerView
@@ -30,18 +27,18 @@ class VocabularyAdapter(private val fullVocabulary: Vocabulary, private val main
         mainActivity.searchView.setOnQueryTextListener(OnQueryTextListener(this@VocabularyAdapter))
         mainActivity.searchView.setOnQueryTextListener(OnQueryTextListener(this@VocabularyAdapter))
     }
     }
 
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): Holder {
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
         val view = LayoutInflater.from(parent.context).inflate(R.layout.word_item, parent, false)
         val view = LayoutInflater.from(parent.context).inflate(R.layout.word_item, parent, false)
-        return Holder(view)
+        return ViewHolder(view)
     }
     }
 
 
     override fun getItemCount(): Int {
     override fun getItemCount(): Int {
         return displayedVocabulary.size()
         return displayedVocabulary.size()
     }
     }
 
 
-    override fun onBindViewHolder(holder: Holder, position: Int) {
+    override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
         val wordItem = displayedVocabulary.getAt(position)
         val wordItem = displayedVocabulary.getAt(position)
-        holder.init(wordItem, position) { view, p -> showPopupMenu(view, p)}
+        viewHolder.init(wordItem, position) { view, p -> showPopupMenu(view, p)}
         //todo set click listener to menu
         //todo set click listener to menu
     }
     }