Commit 14e394cc by Paktalin

Minor refactoring

parent 72b40fdf
......@@ -7,7 +7,7 @@ import android.widget.TextView
import com.paktalin.vocabularynotebook.firestoreitems.WordItem
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 tvTranslation: TextView = itemView.translation
val layout: LinearLayout = itemView.layout
......
......@@ -6,15 +6,12 @@ import android.os.Bundle
import android.support.v7.widget.PopupMenu
import android.support.v7.widget.RecyclerView
import android.view.*
import android.widget.LinearLayout
import android.widget.TextView
import com.paktalin.vocabularynotebook.firestoreitems.WordItem
import com.paktalin.vocabularynotebook.ui.fragments.EditWordFragment
import com.paktalin.vocabularynotebook.ui.activities.MainActivity
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 lateinit var recyclerView: RecyclerView
......@@ -30,18 +27,18 @@ class VocabularyAdapter(private val fullVocabulary: Vocabulary, private val main
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)
return Holder(view)
return ViewHolder(view)
}
override fun getItemCount(): Int {
return displayedVocabulary.size()
}
override fun onBindViewHolder(holder: Holder, position: Int) {
override fun onBindViewHolder(viewHolder: ViewHolder, position: Int) {
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
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment