From 3e656b0c23fcb63c65d1b5a692a81656a48a567e Mon Sep 17 00:00:00 2001
From: Paul Hawke <paul.hawke@gmail.com>
Date: Fri, 22 Oct 2021 06:16:46 -0500
Subject: [PATCH] Converted the WikipediaInstructionsDialogFragment to use
 viewbinding, along with a cleaner way to build bundle arguments for the
 fragment (#4684)

---
 .../WikipediaInstructionsDialogFragment.kt    | 45 +++++++------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/contributions/WikipediaInstructionsDialogFragment.kt b/app/src/main/java/fr/free/nrw/commons/contributions/WikipediaInstructionsDialogFragment.kt
index 67f4024e0..e0f7e7c42 100644
--- a/app/src/main/java/fr/free/nrw/commons/contributions/WikipediaInstructionsDialogFragment.kt
+++ b/app/src/main/java/fr/free/nrw/commons/contributions/WikipediaInstructionsDialogFragment.kt
@@ -5,40 +5,32 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.WindowManager
+import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import fr.free.nrw.commons.R
-import kotlinx.android.synthetic.main.dialog_add_to_wikipedia_instructions.*
+import fr.free.nrw.commons.databinding.DialogAddToWikipediaInstructionsBinding
 
 /**
  * Dialog fragment for displaying instructions for editing wikipedia
  */
 class WikipediaInstructionsDialogFragment : DialogFragment() {
 
-    var contribution: Contribution? = null
     var callback: Callback? = null
 
     override fun onCreateView(
-        inflater: LayoutInflater, container: ViewGroup?,
+        inflater: LayoutInflater,
+        container: ViewGroup?,
         savedInstanceState: Bundle?
-    ): View? {
-        return inflater.inflate(R.layout.dialog_add_to_wikipedia_instructions, container)
-    }
+    ) = DialogAddToWikipediaInstructionsBinding.inflate(inflater, container, false).apply {
+        val contribution: Contribution? = arguments!!.getParcelable(ARG_CONTRIBUTION)
+        tvWikicode.setText(contribution?.media?.wikiCode)
+        instructionsCancel.setOnClickListener { dismiss() }
+        instructionsConfirm.setOnClickListener {
+            callback?.onConfirmClicked(contribution, checkboxCopyWikicode.isChecked)
+        }
+    }.root
 
-    override fun onViewCreated(
-        view: View,
-        savedInstanceState: Bundle?
-    ) {
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        contribution = arguments!!.getParcelable(ARG_CONTRIBUTION)
-        tv_wikicode.setText(contribution?.media?.wikiCode)
-        instructions_cancel.setOnClickListener {
-            dismiss()
-        }
-
-        instructions_confirm.setOnClickListener {
-            callback?.onConfirmClicked(contribution, checkbox_copy_wikicode.isChecked)
-        }
-
         dialog!!.window?.setSoftInputMode(
             WindowManager.LayoutParams.SOFT_INPUT_STATE_ALWAYS_HIDDEN
         )
@@ -52,16 +44,11 @@ class WikipediaInstructionsDialogFragment : DialogFragment() {
     }
 
     companion object {
-
-        val ARG_CONTRIBUTION = "contribution"
+        const val ARG_CONTRIBUTION = "contribution"
 
         @JvmStatic
-        fun newInstance(contribution: Contribution): WikipediaInstructionsDialogFragment {
-            val frag = WikipediaInstructionsDialogFragment()
-            val args = Bundle()
-            args.putParcelable(ARG_CONTRIBUTION, contribution)
-            frag.arguments = args
-            return frag
+        fun newInstance(contribution: Contribution) = WikipediaInstructionsDialogFragment().apply {
+            arguments = bundleOf(ARG_CONTRIBUTION to contribution)
         }
     }
 }