Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

One more follow-up to template flow. #4547

Merged
merged 1 commit into from
Mar 22, 2024
Merged

One more follow-up to template flow. #4547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 1 addition & 11 deletions app/src/main/java/org/wikipedia/edit/EditSectionActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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()
Expand Down
10 changes: 9 additions & 1 deletion app/src/main/java/org/wikipedia/edit/SyntaxHighlightViewAdapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {

Expand Down Expand Up @@ -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)
Expand Down
12 changes: 1 addition & 11 deletions app/src/main/java/org/wikipedia/talk/TalkReplyActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
6 changes: 1 addition & 5 deletions app/src/main/java/org/wikipedia/talk/template/AddTemplateActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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) {
Expand Down