Refactoring

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

@@ -28,7 +28,6 @@ class VocabularyAdapter(private val vocabulary: VocabSet, private val mainActivi
     private lateinit var recyclerView: RecyclerView
     private lateinit var recyclerView: RecyclerView
     private lateinit var viewHolder: ViewHolder
     private lateinit var viewHolder: ViewHolder
     private var tracker: SelectionTracker<Long>? = null
     private var tracker: SelectionTracker<Long>? = null
-    private var menu = true
 
 
     init {
     init {
         setHasStableIds(true)
         setHasStableIds(true)
@@ -68,33 +67,23 @@ class VocabularyAdapter(private val vocabulary: VocabSet, private val mainActivi
     }
     }
 
 
     private fun showPopupMenu(v: View, position: Int) {
     private fun showPopupMenu(v: View, position: Int) {
-        if (menu) {
-            val popup = PopupMenu(mainActivity, v)
-            popup.menuInflater.inflate(R.menu.word_item_menu, popup.menu)
-            popup.setOnMenuItemClickListener {
-                if (it.itemId == R.id.option_delete) {
-                    deleteWord(vocabulary.displayedAt(position), position)
-                }
-                if (it.itemId == R.id.option_edit) {
-                    startEditFragment(v, vocabulary.displayedAt(position))
-                }
-                true
+        val popup = PopupMenu(mainActivity, v)
+        popup.menuInflater.inflate(R.menu.word_item_menu, popup.menu)
+        popup.setOnMenuItemClickListener {
+            if (it.itemId == R.id.option_delete) {
+                deleteWord(vocabulary.displayedAt(position), position)
             }
             }
-            // if not edit mode, then start EditFragment
-            if (mainActivity.supportFragmentManager.findFragmentByTag("edit_fragment") == null)
-                popup.show()
-        } else {
-            Log.d(TAG, "not menu!")
+            if (it.itemId == R.id.option_edit) {
+                startEditFragment(v, vocabulary.displayedAt(position))
+            }
+            true
         }
         }
+        // if not edit mode, then start EditFragment
+        if (mainActivity.supportFragmentManager.findFragmentByTag("edit_fragment") == null)
+            popup.show()
     }
     }
 
 
-    fun refresh() {
-        /*displayedVocabulary.clear()
-        FirestoreManager().extractVocabulary { documents ->
-            displayedVocabulary.addWordsAsDocuments(documents)
-            this.notifyDataSetChanged()
-        }*/
-    }
+    fun refresh() {}
 
 
     private fun deleteWord(wordPojo: WordPojo, position: Int) {
     private fun deleteWord(wordPojo: WordPojo, position: Int) {
         vocabulary.deleteWord(wordPojo)
         vocabulary.deleteWord(wordPojo)