One more follow-up to template flow. (#4547)

wikimedia · Mar 22, 2024 · 669aa40 · 669aa40
1 parent 76db33e
commit 669aa40
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 28 deletions.
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt
@@ -49,7 +49,6 @@ import org.wikipedia.edit.insertmedia.InsertMediaViewModel
 import org.wikipedia.edit.preview.EditPreviewFragment
 import org.wikipedia.edit.richtext.SyntaxHighlighter
 import org.wikipedia.edit.summaries.EditSummaryFragment
-import org.wikipedia.edit.templates.TemplatesSearchActivity
 import org.wikipedia.extensions.parcelableExtra
 import org.wikipedia.history.HistoryEntry
 import org.wikipedia.login.LoginActivity
@@ -155,15 +154,6 @@ class EditSectionActivity : BaseActivity(), ThemeChooserDialog.Callback, EditPre
         }
     }
 
-    private val requestInsertTemplate = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == TemplatesSearchActivity.RESULT_INSERT_TEMPLATE_SUCCESS) {
-            it.data?.let { data ->
-                val newWikiText = data.getStringExtra(TemplatesSearchActivity.RESULT_WIKI_TEXT)
-                binding.editSectionText.inputConnection?.commitText(newWikiText, 1)
-            }
-        }
-    }
-
     private val editTokenThenSave: Unit
         get() {
             cancelCalls()
@@ -240,7 +230,7 @@ class EditSectionActivity : BaseActivity(), ThemeChooserDialog.Callback, EditPre
 
         SyntaxHighlightViewAdapter(this, pageTitle, binding.root, binding.editSectionText,
             binding.editKeyboardOverlay, binding.editKeyboardOverlayFormatting, binding.editKeyboardOverlayHeadings,
-            Constants.InvokeSource.EDIT_ACTIVITY, requestInsertMedia, requestInsertTemplate)
+            Constants.InvokeSource.EDIT_ACTIVITY, requestInsertMedia)
 
         binding.editSectionText.setOnClickListener { finishActionMode() }
         onEditingPrefsChanged()

diff --git a/app/src/main/java/org/wikipedia/edit/SyntaxHighlightViewAdapter.kt b/app/src/main/java/org/wikipedia/edit/SyntaxHighlightViewAdapter.kt
@@ -28,7 +28,6 @@ class SyntaxHighlightViewAdapter(
     private val wikiTextKeyboardHeadingsView: WikiTextKeyboardHeadingsView,
     private val invokeSource: Constants.InvokeSource,
     private val requestInsertMedia: ActivityResultLauncher<Intent>,
-    private val requestInsertTemplate: ActivityResultLauncher<Intent>,
     showUserMention: Boolean = false
 ) : WikiTextKeyboardView.Callback {
 
@@ -63,6 +62,15 @@ class SyntaxHighlightViewAdapter(
         }
     }
 
+    private val requestInsertTemplate = activity.registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
+        if (it.resultCode == TemplatesSearchActivity.RESULT_INSERT_TEMPLATE_SUCCESS) {
+            it.data?.let { data ->
+                val newWikiText = data.getStringExtra(TemplatesSearchActivity.RESULT_WIKI_TEXT)
+                editText.inputConnection?.commitText(newWikiText, 1)
+            }
+        }
+    }
+
     override fun onPreviewLink(title: String) {
         val dialog = LinkPreviewDialog.newInstance(HistoryEntry(PageTitle(title, pageTitle.wikiSite), HistoryEntry.SOURCE_INTERNAL_LINK))
         ExclusiveBottomSheetPresenter.show(activity.supportFragmentManager, dialog)

diff --git a/app/src/main/java/org/wikipedia/talk/TalkReplyActivity.kt b/app/src/main/java/org/wikipedia/talk/TalkReplyActivity.kt
@@ -28,7 +28,6 @@ import org.wikipedia.edit.SyntaxHighlightViewAdapter
 import org.wikipedia.edit.insertmedia.InsertMediaActivity
 import org.wikipedia.edit.insertmedia.InsertMediaViewModel
 import org.wikipedia.edit.preview.EditPreviewFragment
-import org.wikipedia.edit.templates.TemplatesSearchActivity
 import org.wikipedia.extensions.parcelableExtra
 import org.wikipedia.history.HistoryEntry
 import org.wikipedia.login.LoginActivity
@@ -108,15 +107,6 @@ class TalkReplyActivity : BaseActivity(), UserMentionInputView.Listener, EditPre
         }
     }
 
-    private val requestInsertTemplate = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        if (it.resultCode == TemplatesSearchActivity.RESULT_INSERT_TEMPLATE_SUCCESS) {
-            it.data?.let { data ->
-                val newWikiText = data.getStringExtra(TemplatesSearchActivity.RESULT_WIKI_TEXT)
-                binding.replyInputView.editText.inputConnection?.commitText(newWikiText, 1)
-            }
-        }
-    }
-
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityTalkReplyBinding.inflate(layoutInflater)
@@ -190,7 +180,7 @@ class TalkReplyActivity : BaseActivity(), UserMentionInputView.Listener, EditPre
 
         SyntaxHighlightViewAdapter(this, viewModel.pageTitle, binding.root, binding.replyInputView.editText,
             binding.editKeyboardOverlay, binding.editKeyboardOverlayFormatting, binding.editKeyboardOverlayHeadings,
-            Constants.InvokeSource.TALK_REPLY_ACTIVITY, requestInsertMedia, requestInsertTemplate, true)
+            Constants.InvokeSource.TALK_REPLY_ACTIVITY, requestInsertMedia, true)
 
         messagePreviewFragment = supportFragmentManager.findFragmentById(R.id.message_preview_fragment) as EditPreviewFragment
 

diff --git a/app/src/main/java/org/wikipedia/talk/template/AddTemplateActivity.kt b/app/src/main/java/org/wikipedia/talk/template/AddTemplateActivity.kt
@@ -64,10 +64,6 @@ class AddTemplateActivity : BaseActivity(), UserMentionInputView.Listener {
         }
     }
 
-    private val requestInsertTemplate = registerForActivityResult(ActivityResultContracts.StartActivityForResult()) {
-        // TODO: implement this
-    }
-
     public override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = ActivityAddTemplateBinding.inflate(layoutInflater)
@@ -93,7 +89,7 @@ class AddTemplateActivity : BaseActivity(), UserMentionInputView.Listener {
 
         SyntaxHighlightViewAdapter(this, PageTitle("Main Page", wikiSite), binding.root, binding.addTemplateInputView.editText,
             binding.editKeyboardOverlay, binding.editKeyboardOverlayFormatting, binding.editKeyboardOverlayHeadings,
-            Constants.InvokeSource.ADD_TEMPLATE_ACTIVITY, requestInsertMedia, requestInsertTemplate, true)
+            Constants.InvokeSource.ADD_TEMPLATE_ACTIVITY, requestInsertMedia, true)
 
         lifecycleScope.launch {
             repeatOnLifecycle(Lifecycle.State.CREATED) {