Pass intent extras directly to DescriptionEditFragment

Author: Isira-Seneviratne

app/src/main/java/org/wikipedia/Constants.kt

@@ -18,6 +18,10 @@ object Constants {
     const val ARG_TITLE = "title"
     const val ARG_WIKISITE = "wikiSite"
     const val ARG_TEXT = "text"
+    const val ARG_HIGHLIGHT_TEXT = "highlightText"
+    const val ARG_SOURCE_SUMMARY = "sourceSummary"
+    const val ARG_TARGET_SUMMARY = "targetSummary"
+
     const val INTENT_APP_SHORTCUT_CONTINUE_READING = "appShortcutContinueReading"
     const val INTENT_APP_SHORTCUT_RANDOMIZER = "appShortcutRandomizer"
     const val INTENT_APP_SHORTCUT_SEARCH = "appShortcutSearch"

app/src/main/java/org/wikipedia/descriptions/DescriptionEditActivity.kt

@@ -34,14 +34,7 @@ class DescriptionEditActivity : SingleFragmentActivity<DescriptionEditFragment>(
     }
 
     public override fun createFragment(): DescriptionEditFragment {
-        return DescriptionEditFragment.newInstance(
-            intent.parcelableExtra(Constants.ARG_TITLE)!!,
-            intent.getStringExtra(EXTRA_HIGHLIGHT_TEXT),
-            intent.parcelableExtra(EXTRA_SOURCE_SUMMARY),
-            intent.parcelableExtra(EXTRA_TARGET_SUMMARY),
-            intent.serializableExtra(Constants.INTENT_EXTRA_ACTION)!!,
-            intent.serializableExtra(Constants.INTENT_EXTRA_INVOKE_SOURCE)!!
-        )
+        return DescriptionEditFragment.newInstance(intent.extras!!)
     }
 
     override fun onBackPressed() {
@@ -59,7 +52,7 @@ class DescriptionEditActivity : SingleFragmentActivity<DescriptionEditFragment>(
     }
 
     override fun onBottomBarContainerClicked(action: Action) {
-        val key = if (action == Action.TRANSLATE_DESCRIPTION) EXTRA_TARGET_SUMMARY else EXTRA_SOURCE_SUMMARY
+        val key = if (action == Action.TRANSLATE_DESCRIPTION) Constants.ARG_TARGET_SUMMARY else Constants.ARG_SOURCE_SUMMARY
         val summary = intent.parcelableExtra<PageSummaryForEdit>(key)!!
         if (action == Action.ADD_CAPTION || action == Action.TRANSLATE_CAPTION) {
             ExclusiveBottomSheetPresenter.show(supportFragmentManager,
@@ -81,10 +74,6 @@ class DescriptionEditActivity : SingleFragmentActivity<DescriptionEditFragment>(
     }
 
     companion object {
-        private const val EXTRA_HIGHLIGHT_TEXT = "highlightText"
-        private const val EXTRA_SOURCE_SUMMARY = "sourceSummary"
-        private const val EXTRA_TARGET_SUMMARY = "targetSummary"
-
         fun newIntent(context: Context,
                       title: PageTitle,
                       highlightText: String?,
@@ -94,9 +83,9 @@ class DescriptionEditActivity : SingleFragmentActivity<DescriptionEditFragment>(
                       invokeSource: InvokeSource): Intent {
             return Intent(context, DescriptionEditActivity::class.java)
                     .putExtra(Constants.ARG_TITLE, title)
-                    .putExtra(EXTRA_HIGHLIGHT_TEXT, highlightText)
-                    .putExtra(EXTRA_SOURCE_SUMMARY, sourceSummary)
-                    .putExtra(EXTRA_TARGET_SUMMARY, targetSummary)
+                    .putExtra(Constants.ARG_HIGHLIGHT_TEXT, highlightText)
+                    .putExtra(Constants.ARG_SOURCE_SUMMARY, sourceSummary)
+                    .putExtra(Constants.ARG_TARGET_SUMMARY, targetSummary)
                     .putExtra(Constants.INTENT_EXTRA_ACTION, action)
                     .putExtra(Constants.INTENT_EXTRA_INVOKE_SOURCE, invokeSource)
         }

app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.kt

@@ -10,7 +10,6 @@ import android.view.View
 import android.view.ViewGroup
 import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers
@@ -120,9 +119,9 @@ class DescriptionEditFragment : Fragment() {
             Prefs.showDescriptionEditSuccessPrompt = false
         } else {
             val intent = Intent()
-            intent.putExtra(SuggestionsActivity.EXTRA_SOURCE_ADDED_CONTRIBUTION, binding.fragmentDescriptionEditView.description)
-            intent.putExtra(Constants.INTENT_EXTRA_INVOKE_SOURCE, invokeSource)
-            intent.putExtra(Constants.INTENT_EXTRA_ACTION, action)
+                .putExtra(SuggestionsActivity.EXTRA_SOURCE_ADDED_CONTRIBUTION, binding.fragmentDescriptionEditView.description)
+                .putExtra(Constants.INTENT_EXTRA_INVOKE_SOURCE, invokeSource)
+                .putExtra(Constants.INTENT_EXTRA_ACTION, action)
             requireActivity().setResult(Activity.RESULT_OK, intent)
             DeviceUtil.hideSoftKeyboard(requireActivity())
             requireActivity().finish()
@@ -133,11 +132,11 @@ class DescriptionEditFragment : Fragment() {
         super.onCreate(savedInstanceState)
         val arguments = requireArguments()
         pageTitle = arguments.parcelable(Constants.ARG_TITLE)!!
-        highlightText = arguments.getString(ARG_HIGHLIGHT_TEXT)
-        action = arguments.serializable(ARG_ACTION)!!
+        highlightText = arguments.getString(Constants.ARG_HIGHLIGHT_TEXT)
+        action = arguments.serializable(Constants.INTENT_EXTRA_ACTION)!!
         invokeSource = arguments.serializable(Constants.INTENT_EXTRA_INVOKE_SOURCE)!!
-        sourceSummary = arguments.parcelable(ARG_SOURCE_SUMMARY)
-        targetSummary = arguments.parcelable(ARG_TARGET_SUMMARY)
+        sourceSummary = arguments.parcelable(Constants.ARG_SOURCE_SUMMARY)
+        targetSummary = arguments.parcelable(Constants.ARG_TARGET_SUMMARY)
         EditAttemptStepEvent.logInit(pageTitle, EditAttemptStepEvent.INTERFACE_OTHER)
     }
 
@@ -544,10 +543,6 @@ class DescriptionEditFragment : Fragment() {
     companion object {
         private const val ARG_REVIEWING = "inReviewing"
         private const val ARG_DESCRIPTION = "description"
-        private const val ARG_HIGHLIGHT_TEXT = "highlightText"
-        private const val ARG_ACTION = "action"
-        private const val ARG_SOURCE_SUMMARY = "sourceSummary"
-        private const val ARG_TARGET_SUMMARY = "targetSummary"
         const val MACHINE_SUGGESTION = "#machine-suggestion"
         const val MACHINE_SUGGESTION_MODIFIED = "#machine-suggestion-modified"
 
@@ -556,19 +551,9 @@ class DescriptionEditFragment : Fragment() {
         @Suppress("RegExpRedundantEscape")
         const val TEMPLATE_PARSE_REGEX = "(\\{\\{[Ss]hort description\\|(?:1=)?)([^}|]+)([^}]*\\}\\})"
 
-        fun newInstance(title: PageTitle,
-                        highlightText: String?,
-                        sourceSummary: PageSummaryForEdit?,
-                        targetSummary: PageSummaryForEdit?,
-                        action: DescriptionEditActivity.Action,
-                        source: InvokeSource): DescriptionEditFragment {
+        fun newInstance(bundle: Bundle): DescriptionEditFragment {
             return DescriptionEditFragment().apply {
-                arguments = bundleOf(Constants.ARG_TITLE to title,
-                        ARG_HIGHLIGHT_TEXT to highlightText,
-                        ARG_SOURCE_SUMMARY to sourceSummary,
-                        ARG_TARGET_SUMMARY to targetSummary,
-                        ARG_ACTION to action,
-                        Constants.INTENT_EXTRA_INVOKE_SOURCE to source)
+                arguments = bundle
             }
         }
     }