Name refactoring

app/src/main/java/com/paktalin/vocabularynotebook/ui/fragments/AddWordFragment.kt

@@ -8,7 +8,7 @@ import com.paktalin.vocabularynotebook.firestoreitems.Vocabulary.Companion.VOCAB
 import com.paktalin.vocabularynotebook.firestoreitems.Vocabulary.Companion.WORDS
 import com.paktalin.vocabularynotebook.firestoreitems.WordItem
 import com.paktalin.vocabularynotebook.shortToast
-import kotlinx.android.synthetic.main.fragment_new_word.*
+import kotlinx.android.synthetic.main.fragment_editable_word.*
 
 class AddWordFragment : WordFragment() {
 

app/src/main/java/com/paktalin/vocabularynotebook/ui/fragments/EditWordFragment.kt

@@ -12,11 +12,11 @@ import com.paktalin.vocabularynotebook.firestoreitems.WordItem
 import com.paktalin.vocabularynotebook.appsetup.ConfiguredFirestore
 import com.paktalin.vocabularynotebook.firestoreitems.Vocabulary.Companion.VOCABULARIES
 import com.paktalin.vocabularynotebook.firestoreitems.Vocabulary.Companion.WORDS
-import com.paktalin.vocabularynotebook.hide
 import com.paktalin.vocabularynotebook.removeFragment
 import com.paktalin.vocabularynotebook.shortToast
 import com.paktalin.vocabularynotebook.ui.activities.MainActivity
-import kotlinx.android.synthetic.main.fragment_new_word.*
+import kotlinx.android.synthetic.main.fragment_editable_word.*
+import kotlinx.android.synthetic.main.content_main.*
 import kotlinx.android.synthetic.main.word_item.view.*
 
 class EditWordFragment : WordFragment() {
@@ -61,7 +61,7 @@ class EditWordFragment : WordFragment() {
                 .collection(WORDS).document(wordItem.id).set(wordPojo)
                 .addOnSuccessListener {
                     Log.i(TAG, "Successfully updated the word")
-                    hide(btnSubmit)
+                    hideSubmitButton()
                     mainActivity.removeProgressBar()
                     wordItem.pojo = wordPojo
                     updateRecycleView(wordItem)
@@ -76,7 +76,7 @@ class EditWordFragment : WordFragment() {
 
     private fun stop() {
         // set onClickListener from AddWordFragment
-        //mainActivity.btnSubmit.setOnClickListener { (mainActivity.fragmentNewWord as AddWordFragment).submitWord() }
+        mainActivity.btnSubmit.setOnClickListener { (mainActivity.fragmentAddWord as AddWordFragment).submitWord() }
         removeFragment(mainActivity.supportFragmentManager, this)
     }
 

app/src/main/java/com/paktalin/vocabularynotebook/ui/fragments/WordFragment.kt

@@ -9,10 +9,9 @@ import android.view.View
 import android.view.ViewGroup
 import com.paktalin.vocabularynotebook.R
 import com.paktalin.vocabularynotebook.firestoreitems.WordItem
-import com.paktalin.vocabularynotebook.hide
-import com.paktalin.vocabularynotebook.show
 import com.paktalin.vocabularynotebook.ui.activities.MainActivity
-import kotlinx.android.synthetic.main.fragment_new_word.*
+import kotlinx.android.synthetic.main.fragment_editable_word.*
+import kotlinx.android.synthetic.main.content_main.*
 
 abstract class WordFragment : Fragment() {
     protected lateinit var mainActivity: MainActivity
@@ -24,14 +23,13 @@ abstract class WordFragment : Fragment() {
         set(value) { field = value; updateButtons() }
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
-        return inflater.inflate(R.layout.fragment_new_word, container, false)
+        return inflater.inflate(R.layout.fragment_editable_word, container, false)
     }
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         super.onActivityCreated(savedInstanceState)
         mainActivity = activity as MainActivity
-
-        btnSubmit.setOnClickListener { submitWord() }
+        mainActivity.btnSubmit.setOnClickListener { submitWord() }
         word.addTextChangedListener(textWatcher {
             wordEmpty = word.text.isEmpty() })
 
@@ -42,8 +40,8 @@ abstract class WordFragment : Fragment() {
     }
 
     open fun updateButtons() {
-        if (!wordEmpty && !translationEmpty) show(btnSubmit)
-        if (wordEmpty || translationEmpty) hide(btnSubmit)
+        if (!wordEmpty && !translationEmpty) showSubmitButton()
+        if (wordEmpty || translationEmpty) hideSubmitButton()
     }
 
     private fun textWatcher(setEmpty: () -> Unit): TextWatcher {
@@ -54,7 +52,13 @@ abstract class WordFragment : Fragment() {
         }
     }
 
-    private fun submitWord() {
+    private fun showSubmitButton() {
+        mainActivity.btnSubmitLayout.visibility = View.VISIBLE }
+
+    protected fun hideSubmitButton() {
+        mainActivity.btnSubmitLayout.visibility = View.GONE }
+
+    fun submitWord() {
         mainActivity.hideKeyboardNotFromActivity(mainActivity)
 
         val word = word.text.toString()

app/src/main/res/layout/activity_main.xml

@@ -13,7 +13,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <include layout="@layout/notebook_sheet" />
+        <include layout="@layout/content_main" />
     </FrameLayout>
 
     <android.support.design.widget.NavigationView