toggling signature on FastHub icon click.

This commit is contained in:
Kosh Sergani 2017-08-19 10:31:44 +08:00
parent c1d4a0e827
commit 06014bb522
3 changed files with 20 additions and 22 deletions

View File

@ -197,20 +197,11 @@ class EditorActivity : BaseActivity<EditorMvp.View, EditorPresenter>(), EditorMv
override fun getSavedText(): CharSequence = editText.savedText
override fun onReview(enabled: Boolean) {}
override fun fragmentManager(): FragmentManager = supportFragmentManager
@SuppressLint("SetTextI18n")
override fun onEmojiAdded(emoji: Emoji?) {
ViewHelper.showKeyboard(editText)
emoji?.let {
editText.setText(if (editText.text.isNullOrEmpty()) {
":${it.aliases[0]}:"
} else {
"${editText.text} :${it.aliases[0]}:"
})
}
markDownLayout.onEmojiAdded(emoji)
}
private fun onCreate() {

View File

@ -118,15 +118,7 @@ class AddGistBottomSheetDialog : BaseDialogFragment<AddGistMvp.View, AddGistPres
@SuppressLint("SetTextI18n")
override fun onEmojiAdded(emoji: Emoji?) {
ViewHelper.showKeyboard(editText)
ViewHelper.showKeyboard(editText)
emoji?.let {
editText.setText(if (editText.text.isNullOrEmpty()) {
":${it.aliases[0]}:"
} else {
"${editText.text} :${it.aliases[0]}:"
})
}
markDownLayout.onEmojiAdded(emoji)
}
companion object {

View File

@ -1,5 +1,6 @@
package com.fastaccess.ui.widgets.markdown
import android.annotation.SuppressLint
import android.content.Context
import android.support.design.widget.Snackbar
import android.support.transition.TransitionManager
@ -16,6 +17,7 @@ import com.fastaccess.R
import com.fastaccess.helper.AppHelper
import com.fastaccess.helper.InputHelper
import com.fastaccess.helper.ViewHelper
import com.fastaccess.provider.emoji.Emoji
import com.fastaccess.provider.markdown.MarkDownProvider
import com.fastaccess.ui.modules.editor.emoji.EmojiBottomSheet
import com.fastaccess.ui.modules.editor.popup.EditorLinkImageDialogFragment
@ -56,7 +58,6 @@ class MarkDownLayout : LinearLayout {
TransitionManager.beginDelayedTransition(this)
if (editText.isEnabled && !InputHelper.isEmpty(editText)) {
editText.isEnabled = false
it.onReview(false)
MarkDownProvider.setMdText(editText, InputHelper.toString(editText))
editorIconsHolder.visibility = View.INVISIBLE
ViewHelper.hideKeyboard(editText)
@ -64,7 +65,6 @@ class MarkDownLayout : LinearLayout {
editText.setText(it.getSavedText())
editText.setSelection(it.getSavedText().length)
editText.isEnabled = true
it.onReview(true)
editorIconsHolder.visibility = View.VISIBLE
ViewHelper.showKeyboard(editText)
}
@ -96,6 +96,7 @@ class MarkDownLayout : LinearLayout {
}
}
@SuppressLint("SetTextI18n")
private fun onActionClicked(editText: EditText, id: Int) {
if (editText.selectionEnd == -1 || editText.selectionStart == -1) {
return
@ -121,16 +122,30 @@ class MarkDownLayout : LinearLayout {
markdownListener?.getEditText()?.let {
if (!it.text.toString().contains(sentFromFastHub)) {
it.setText("${it.text}$sentFromFastHub")
} else {
it.setText(it.text.toString().replace(sentFromFastHub, ""))
}
}
}
}
}
fun onEmojiAdded(emoji: Emoji?) {
markdownListener?.getEditText()?.let { editText ->
ViewHelper.showKeyboard(editText)
emoji?.let {
editText.setText(if (editText.text.isNullOrEmpty()) {
":${it.aliases[0]}:"
} else {
"${editText.text} :${it.aliases[0]}:"
})
}
}
}
interface MarkdownListener {
fun getEditText(): EditText
fun fragmentManager(): FragmentManager
fun getSavedText(): CharSequence
fun onReview(enabled: Boolean) {}
}
}