Editor | Refact | Remove copy-paste when setting block background color (#2252)

core-ui/src/main/java/com/anytypeio/anytype/core_ui/extensions/PaletteExtension.kt

@@ -2,6 +2,7 @@ package com.anytypeio.anytype.core_ui.extensions
 
 import android.content.Context
 import android.content.res.Resources
+import android.view.View
 import android.widget.TextView
 import com.anytypeio.anytype.core_ui.R
 import com.anytypeio.anytype.presentation.editor.editor.ThemeColor
@@ -58,7 +59,28 @@ fun TextView.setTextColor(color: String, defaultColor: Int = R.color.text_primar
     }
 }
 
-fun Context.resolveThemedColor(color: String?, defaultColor: Int): Int {
+
+/**
+ * @param [color] color code, @see [ThemeColor]
+ */
+fun View.setBlockBackgroundColor(color: String?) {
+    if (!color.isNullOrEmpty()) {
+        val value = ThemeColor.values().find { value -> value.title == color }
+        if (value != null && value != ThemeColor.DEFAULT) {
+            setBackgroundColor(resources.lighter(value, 0))
+        } else {
+            background = null
+        }
+    } else {
+        background = null
+    }
+}
+
+
+/**
+ * @param [color] color code, @see [ThemeColor]
+ */
+fun Context.resolveThemedTextColor(color: String?, defaultColor: Int): Int {
     val value = ThemeColor.values().find { value -> value.title == color }
     return if (value != null && value != ThemeColor.DEFAULT) {
         resources.dark(value, defaultColor)

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/BlockTextAdapter.kt

@@ -1,728 +0,0 @@
-package com.anytypeio.anytype.core_ui.features.editor
-
-/*
-
-import android.view.LayoutInflater
-import android.view.ViewGroup
-import androidx.recyclerview.widget.DiffUtil
-import androidx.recyclerview.widget.RecyclerView
-import com.anytypeio.anytype.core_ui.R
-import com.anytypeio.anytype.core_ui.features.page.*
-import com.anytypeio.anytype.core_ui.features.page.holders.*
-import com.anytypeio.anytype.core_ui.tools.*
-import com.anytypeio.anytype.core_utils.ext.typeOf
-import timber.log.Timber
-
-class BlockTextAdapter(
-    private var blocks: List<BlockView>,
-    private val event: (BlockTextEvent) -> Unit,
-    private val click: (ListenerType) -> Unit
-) : RecyclerView.Adapter<BlockTextViewHolder>() {
-
-    val views: List<BlockView> get() = blocks
-
-    override fun getItemViewType(position: Int) = blocks[position].getViewType()
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BlockTextViewHolder {
-        val inflater = LayoutInflater.from(parent.context)
-        return when (viewType) {
-            BlockViewHolder.HOLDER_PARAGRAPH -> {
-                ParagraphViewHolder(
-                    view = inflater.inflate(R.layout.item_block_text, parent, false),
-                    textWatcher = BlockTextWatcher(),
-                    mentionWatcher = BlockTextMentionWatcher(),
-                    backspaceWatcher = BlockTextBackspaceWatcher(),
-                    enterWatcher = BlockTextEnterWatcher(),
-                    actionMenu = BlockTextMenu(ContextMenuType.TEXT)
-                )
-            }
-            BlockViewHolder.HOLDER_CHECKBOX -> {
-                CheckboxViewHolder(
-                    view = inflater.inflate(R.layout.item_block_checkbox, parent, false),
-                    textWatcher = BlockTextWatcher(),
-                    mentionWatcher = BlockTextMentionWatcher(),
-                    backspaceWatcher = BlockTextBackspaceWatcher(),
-                    enterWatcher = BlockTextEnterWatcher(),
-                    actionMenu = BlockTextMenu(ContextMenuType.TEXT)
-                )
-            }
-            BlockViewHolder.HOLDER_HEADER_ONE -> {
-                HeaderOneViewHolder(
-                    view = inflater.inflate(R.layout.item_block_header_one, parent, false),
-                    textWatcher = BlockTextWatcher(),
-                    mentionWatcher = BlockTextMentionWatcher(),
-                    backspaceWatcher = BlockTextBackspaceWatcher(),
-                    enterWatcher = BlockTextEnterWatcher(),
-                    actionMenu = BlockTextMenu(ContextMenuType.HEADER)
-                )
-            }
-            BlockViewHolder.HOLDER_HEADER_TWO -> {
-                HeaderTwoViewHolder(
-                    view = inflater.inflate(R.layout.item_block_header_two, parent, false),
-                    textWatcher = BlockTextWatcher(),
-                    mentionWatcher = BlockTextMentionWatcher(),
-                    backspaceWatcher = BlockTextBackspaceWatcher(),
-                    enterWatcher = BlockTextEnterWatcher(),
-                    actionMenu = BlockTextMenu(ContextMenuType.HEADER)
-                )
-            }
-            BlockViewHolder.HOLDER_HEADER_THREE -> {
-                HeaderThreeViewHolder(
-                    view = inflater.inflate(R.layout.item_block_header_three, parent, false),
-                    textWatcher = BlockTextWatcher(),
-                    mentionWatcher = BlockTextMentionWatcher(),
-                    backspaceWatcher = BlockTextBackspaceWatcher(),
-                    enterWatcher = BlockTextEnterWatcher(),
-                    actionMenu = BlockTextMenu(ContextMenuType.HEADER)
-                )
-            }
-            else -> throw IllegalStateException("Unexpected view type: $viewType")
-        }
-    }
-
-    override fun getItemCount(): Int = blocks.size
-
-    override fun onBindViewHolder(holder: BlockTextViewHolder, position: Int) {
-
-        val block = blocks[position]
-
-        if (holder is Holder.Indentable && block is BlockView.Indentable) {
-            holder.indentize(block.indent)
-        }
-
-        if (holder is Holder.Selectable && block is BlockView.Selectable) {
-            holder.select(block.isSelected)
-        }
-
-        if (holder is Holder.Alignable && block is BlockView.Alignable) {
-            holder.align(block.alignment)
-        }
-    }
-
-    // Bug workaround for losing text selection ability, see:
-    // https://code.google.com/p/android/issues/detail?id=208169
-    override fun onViewAttachedToWindow(holder: BlockTextViewHolder) {
-        super.onViewAttachedToWindow(holder)
-        holder.content.isEnabled = false
-        holder.content.isEnabled = true
-    }
-
-    fun updateWithDiffUtil(items: List<BlockView>) {
-        logDataSetUpdateEvent(items)
-        val result = DiffUtil.calculateDiff(BlockViewDiffUtil(old = blocks, new = items))
-        blocks = items
-        result.dispatchUpdatesTo(this)
-    }
-
-    private fun logDataSetUpdateEvent(items: List<BlockView>) {
-        Timber.d("----------Updating------------")
-        items.forEach { Timber.d(it.toString()) }
-        Timber.d("----------Finished------------")
-    }
-
-    override fun onBindViewHolder(
-        holder: BlockTextViewHolder,
-        position: Int,
-        payloads: MutableList<Any>
-    ) {
-        if (payloads.isEmpty())
-            onBindViewHolder(holder, position)
-        else {
-            val block = blocks[position]
-            if (block is Item) {
-                holder.payload(
-                    payloads = payloads.typeOf(),
-                    clicked = click,
-                    item = block
-                )
-            }
-        }
-    }
-}
-
-package com.anytypeio.anytype.core_ui.features.page.models
-
-import android.text.Editable
-import android.text.SpannableString
-import android.view.View
-import android.view.inputmethod.InputMethodManager
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import com.anytypeio.anytype.core_ui.R
-import com.anytypeio.anytype.core_ui.common.Focusable
-import com.anytypeio.anytype.core_ui.common.Markup
-import com.anytypeio.anytype.core_ui.common.ThemeColor
-import com.anytypeio.anytype.core_ui.common.getBlockTextColor
-import com.anytypeio.anytype.core_ui.extensions.color
-import com.anytypeio.anytype.core_ui.extensions.cursorYBottomCoordinate
-import com.anytypeio.anytype.core_ui.extensions.preserveSelection
-import com.anytypeio.anytype.core_ui.extensions.range
-import com.anytypeio.anytype.core_ui.features.page.*
-import com.anytypeio.anytype.core_ui.features.page.BlockTextEvent.KeyboardEvent
-import com.anytypeio.anytype.core_ui.features.page.BlockTextEvent.MarkupEvent
-import com.anytypeio.anytype.core_ui.features.page.holders.Holder
-import com.anytypeio.anytype.core_ui.tools.*
-import com.anytypeio.anytype.core_ui.widgets.text.EditorLongClickListener
-import com.anytypeio.anytype.core_ui.widgets.text.TextInputWidget
-import com.anytypeio.anytype.core_utils.ext.PopupExtensions
-import com.anytypeio.anytype.core_utils.ext.hideKeyboard
-import com.anytypeio.anytype.core_utils.ext.imm
-import me.saket.bettermovementmethod.BetterLinkMovementMethod
-import timber.log.Timber
-
-
-interface Item : Focusable, BlockView.TextSupport, BlockView.Permission, BlockView.Cursor, Markup {
-    val id: String
-    override val body: String get() = text
-}
-
-@Deprecated("Work in progress")
-abstract class BlockTextViewHolder(
-    view: View,
-    private val textWatcher: BlockTextWatcher,
-    private val mentionWatcher: BlockTextMentionWatcher,
-    private val backspaceWatcher: BlockTextBackspaceWatcher,
-    private val enterWatcher: BlockTextEnterWatcher,
-    private val actionMenu: BlockTextMenu
-) : RecyclerView.ViewHolder(view), Holder.Selectable, Holder.Indentable {
-
-    val root = itemView
-
-    abstract val content: TextInputWidget
-
-    open val spannableFactory: DefaultSpannableFactory = DefaultSpannableFactory()
-
-    init {
-        with(content) {
-            setSpannableFactory(spannableFactory)
-            addTextChangedListener(textWatcher)
-            addTextChangedListener(mentionWatcher)
-            setOnKeyListener(backspaceWatcher)
-            setOnEditorActionListener(enterWatcher)
-            customSelectionActionModeCallback = actionMenu
-        }
-    }
-
-    fun bind(
-        click: (ListenerType) -> Unit,
-        event: (BlockTextEvent) -> Unit,
-        item: Item
-    ) = when (item.mode) {
-        BlockView.Mode.READ ->
-            bindReadMode(
-                id = item.id,
-                text = item.text,
-                markup = item,
-                textColor = item.getBlockTextColor(),
-                backgroundColor = item.backgroundColor,
-                clicked = click,
-                event = event
-            )
-        BlockView.Mode.EDIT ->
-            bindEditMode(
-                id = item.id,
-                text = item.text,
-                markup = item,
-                textColor = item.getBlockTextColor(),
-                backgroundColor = item.backgroundColor,
-                clicked = click,
-                event = event,
-                focused = item.isFocused,
-                cursor = item,
-                item = item
-            )
-    }
-
-    private fun bindReadMode(
-        id: String,
-        text: String? = null,
-        textColor: Int,
-        backgroundColor: String? = null,
-        markup: Markup,
-        clicked: (ListenerType) -> Unit,
-        event: (BlockTextEvent) -> Unit
-    ) {
-        removeListeners()
-        enableReadMode()
-        setText(text, markup, clicked, textColor)
-        setTextColor(textColor)
-        setBackgroundColor(backgroundColor)
-        setClicks(id, clicked)
-        setSelectionListener(id, event)
-    }
-
-    private fun bindEditMode(
-        id: String,
-        text: String? = null,
-        markup: Markup,
-        textColor: Int,
-        backgroundColor: String? = null,
-        focused: Boolean,
-        cursor: BlockView.Cursor,
-        clicked: (ListenerType) -> Unit,
-        event: (BlockTextEvent) -> Unit,
-        item: Item
-    ) {
-        enableEditMode()
-        setText(text, markup, clicked, textColor)
-        setTextColor(textColor)
-        setBackgroundColor(backgroundColor)
-        setFocus(focused)
-        setCursor(cursor)
-        setClicks(id, clicked)
-        setListeners(id, event, item)
-    }
-
-    // -------------------- MODE ------------------------------
-    private fun enableReadMode() {
-        content.enableReadMode()
-        content.selectionWatcher = null
-    }
-
-    private fun enableEditMode() {
-        content.enableEditMode()
-    }
-
-    // ------------ INDENT ----------------
-    abstract override fun indentize(indent: Int)
-
-    // ------------ SET TEXT ----------------
-    private fun setText(
-        text: String?,
-        markup: Markup?,
-        clicked: (ListenerType) -> Unit,
-        textColor: Int
-    ) {
-        if (text == null) {
-            content.text = null
-        } else {
-            if (markup == null || markup.marks.isNullOrEmpty()) {
-                content.setText(text)
-            } else {
-                setBlockSpannableText(markup, clicked, textColor)
-            }
-        }
-    }
-
-    private fun setBlockSpannableText(
-        markup: Markup,
-        clicked: (ListenerType) -> Unit,
-        textColor: Int
-    ) {
-        if (markup.marks.any { it.type == Markup.Type.MENTION }) {
-            setSpannableWithMention(markup, clicked, textColor)
-        } else {
-            setSpannable(markup, textColor)
-        }
-    }
-
-    private fun setSpannable(markup: Markup, textColor: Int) {
-        content.setText(getSpannableText(markup, textColor), TextView.BufferType.SPANNABLE)
-    }
-
-    private fun setSpannableWithMention(
-        markup: Markup,
-        clicked: (ListenerType) -> Unit,
-        textColor: Int
-    ) = with(content) {
-        movementMethod = BetterLinkMovementMethod.getInstance()
-        setText(
-            buildSpannableTextWithMention(markup, clicked, textColor),
-            TextView.BufferType.SPANNABLE
-        )
-    }
-
-    private fun getSpannableText(markup: Markup, textColor: Int): SpannableString =
-        SpannableString(markup.body).apply {
-            setMarkup(markup = markup, textColor = textColor)
-        }
-
-    private fun buildSpannableTextWithMention(
-        markup: Markup,
-        clicked: ((ListenerType) -> Unit)? = null,
-        textColor: Int
-    ): SpannableString {
-        val sizes = getMentionSizes()
-        return SpannableString(markup.body).apply {
-            setMarkup(
-                markup = markup,
-                context = content.context,
-                mentionImageSize = sizes.first,
-                mentionImagePadding = sizes.second,
-                click = {
-                    clicked?.invoke(ListenerType.Mention(it))
-                },
-                textColor = textColor
-            )
-        }
-    }
-
-    // ------------ EDITABLE UPDATE MARKUP ----------------
-    private fun updateEditableMarkup(
-        editable: Editable,
-        markup: Markup?,
-        clicked: (ListenerType) -> Unit
-    ) {
-        if ((markup == null || markup.marks.isNullOrEmpty())) {
-            editable.clearSpans()
-        } else {
-            updateMarkup(editable, markup, clicked)
-        }
-    }
-
-    abstract fun getMentionSizes(): Pair<Int, Int>
-
-    private fun updateMarkup(editable: Editable, markup: Markup, clicked: (ListenerType) -> Unit) {
-        if (markup.marks.any { it.type == Markup.Type.MENTION }) {
-            val sizes = getMentionSizes()
-            content.dismissMentionWatchers()
-            content.movementMethod = BetterLinkMovementMethod.getInstance()
-            editable.setMarkup(
-                markup = markup,
-                context = content.context,
-                mentionImageSize = sizes.first,
-                mentionImagePadding = sizes.second,
-                click = {
-                    clicked.invoke(ListenerType.Mention(it))
-                }
-            )
-        } else {
-            editable.setMarkup(markup)
-        }
-    }
-
-    // ------------ TEXT COLOR, BACKGROUND COLOR ----------------
-
-    open fun setTextColor(textColor: Int) {
-        content.setTextColor(textColor)
-    }
-
-    private fun setBackgroundColor(color: String?) {
-        if (color != null) {
-            root.setBackgroundColor(
-                ThemeColor.values().first { value ->
-                    value.title == color
-                }.background
-            )
-        } else {
-            root.background = null
-        }
-    }
-
-    // ------------ FOCUS ----------------
-    private fun setFocus(focused: Boolean) {
-        if (focused) {
-            content.apply {
-                post {
-                    if (!hasFocus()) {
-                        if (requestFocus()) {
-                            context.imm().showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
-                        } else {
-                            Timber.d("Couldn't gain focus")
-                        }
-                    } else
-                        Timber.d("Already had focus")
-                }
-            }
-        } else {
-            content.clearFocus()
-        }
-    }
-
-    // ------------ CURSOR ----------------
-    private fun setCursor(item: BlockView.Cursor) {
-        item.cursor?.let {
-            val length = content.text?.length ?: 0
-            if (it in 0..length) {
-                content.setSelection(it)
-            }
-        }
-    }
-
-    // ------------ CLICKS ----------------
-    private fun setClicks(id: String, clicked: (ListenerType) -> Unit) {
-        content.setOnLongClickListener(
-            EditorLongClickListener(
-                t = id,
-                click = { onBlockLongClick(root, it, clicked) }
-            )
-        )
-        content.setOnClickListener {
-            clicked(ListenerType.EditableBlock(id))
-        }
-    }
-
-    private fun onBlockLongClick(root: View, target: String, clicked: (ListenerType) -> Unit) {
-        val rect = PopupExtensions.calculateRectInWindow(root)
-        val dimensions = BlockDimensions(
-            left = rect.left,
-            top = rect.top,
-            bottom = rect.bottom,
-            right = rect.right,
-            height = root.height,
-            width = root.width
-        )
-        clicked(ListenerType.LongClick(target, dimensions))
-    }
-
-    // ------------ LISTENERS ----------------
-    private fun setListeners(
-        id: String,
-        event: (BlockTextEvent) -> Unit,
-        item: Item
-    ) {
-        setTextListener(id, event, item)
-        setMentionListener(event)
-        setBackspaceListener(id, event)
-        setEnterListener(id, event)
-        setClipboardListener(event)
-        setSelectionListener(id, event)
-        setFocusListener(id, event)
-        setActionModeListener(event)
-    }
-
-    private fun removeListeners() {
-        removeTextListener()
-        removeMentionListener()
-        removeBackspaceListener()
-        removeEnterListener()
-        removeClipboardListener()
-        removeSelectionListener()
-        removeFocusListener()
-        removeActionModeListener()
-    }
-
-    // ------------ TEXT LISTENER ----------------
-    private fun setTextListener(
-        id: String,
-        event: (BlockTextEvent) -> Unit,
-        item: Item
-    ) {
-        textWatcher.setListener { editable ->
-            onTextEvent(event, id, item, editable)
-        }
-    }
-
-    private fun removeTextListener() {
-        textWatcher.removeListener()
-    }
-
-    abstract fun onTextEvent(event: (BlockTextEvent) -> Unit, id: String, item: Item, editable: Editable)
-
-    // ------------ MENTION LISTENER ----------------
-    private fun setMentionListener(event: (BlockTextEvent) -> Unit) {
-        mentionWatcher.setListener { state ->
-            when (state) {
-                is BlockTextMentionWatcher.MentionTextWatcherState.Start -> {
-                    event(
-                        BlockTextEvent.MentionEvent.Start(
-                            cursorCoordinate = content.cursorYBottomCoordinate(),
-                            mentionStart = state.start
-                        )
-                    )
-                }
-                BlockTextMentionWatcher.MentionTextWatcherState.Stop -> {
-                    event.invoke(BlockTextEvent.MentionEvent.Stop)
-                }
-                is BlockTextMentionWatcher.MentionTextWatcherState.Text -> {
-                    event.invoke(BlockTextEvent.MentionEvent.Text(state.text))
-                }
-            }
-        }
-    }
-
-    private fun removeMentionListener() {
-        mentionWatcher.removeListener()
-        mentionWatcher.onDismiss()
-    }
-
-    // ------------ ENTER LISTENER ----------------
-    private fun setEnterListener(
-        id: String,
-        event: (BlockTextEvent) -> Unit
-    ) {
-        enterWatcher.setListener { enterEvent ->
-            when (enterEvent) {
-                is BlockTextEnterWatcher.EnterEvent.Split ->
-                    event(
-                        KeyboardEvent.SplitLineEnter(
-                            target = id,
-                            index = enterEvent.selectionEnd,
-                            text = enterEvent.text
-                        )
-                    )
-                is BlockTextEnterWatcher.EnterEvent.EndLine ->
-                    event(KeyboardEvent.EndLineEnter(target = id, text = content.editableText))
-            }
-        }
-    }
-
-    private fun removeEnterListener() {
-        enterWatcher.removeListener()
-    }
-
-    // ------------ BACKSPACE LISTENER ----------------
-    private fun setBackspaceListener(
-        id: String,
-        event: (BlockTextEvent) -> Unit
-    ) {
-        backspaceWatcher.setListener {
-            if (content.text?.isEmpty() == true) {
-                if (bindingAdapterPosition != RecyclerView.NO_POSITION) {
-                    event(KeyboardEvent.EmptyBlockBackspace(id))
-                } else {
-                    Timber.e("Holder.adapter position is -1")
-                }
-            } else {
-                if (bindingAdapterPosition != RecyclerView.NO_POSITION) {
-                    content.text?.let { editable ->
-                        event(KeyboardEvent.NonEmptyBlockBackspace(id, editable))
-                    }
-                } else {
-                    Timber.e("Holder.adapter position is -1")
-                }
-            }
-        }
-    }
-
-    private fun removeBackspaceListener() {
-        backspaceWatcher.removeListener()
-    }
-
-    // ------------ SELECTION LISTENER ----------------
-    private fun setSelectionListener(id: String, event: (BlockTextEvent) -> Unit) {
-        content.selectionWatcher =
-            { range -> event(BlockTextEvent.SelectionEvent(id, range)) }
-    }
-
-    private fun removeSelectionListener() {
-        content.selectionWatcher = null
-    }
-
-    // ------------ FOCUS LISTENER ----------------
-    private fun setFocusListener(id: String, event: (BlockTextEvent) -> Unit) {
-        content.setOnFocusChangeListener { _, focus ->
-            event(BlockTextEvent.FocusEvent(id, focus))
-        }
-    }
-
-    private fun removeFocusListener() {
-        content.onFocusChangeListener = null
-    }
-
-    // ------------ CLIPBOARD LISTENER ----------------
-    private fun setClipboardListener(event: (BlockTextEvent) -> Unit) {
-        content.clipboardInterceptor = object : ClipboardInterceptor {
-            override fun onClipboardAction(action: ClipboardInterceptor.Action) {
-                when (action) {
-                    is ClipboardInterceptor.Action.Copy ->
-                        event.invoke(BlockTextEvent.Action.Copy(action.selection))
-                    is ClipboardInterceptor.Action.Paste ->
-                        event.invoke(BlockTextEvent.Action.Paste(action.selection))
-                }
-            }
-        }
-    }
-
-    private fun removeClipboardListener() {
-        content.clipboardInterceptor = null
-    }
-
-    // ------------ ACTION MODE LISTENER ----------------
-    private fun setActionModeListener(event: (BlockTextEvent) -> Unit) {
-        actionMenu.setListener { type, mode ->
-            when (type) {
-                Markup.Type.TEXT_COLOR -> {
-                    content.preserveSelection {
-                        content.hideKeyboard()
-                        event.invoke(MarkupEvent(Markup.Type.TEXT_COLOR, content.range()))
-                        mode.finish()
-                    }
-                }
-                Markup.Type.BACKGROUND_COLOR -> {
-                    content.preserveSelection {
-                        content.hideKeyboard()
-                        event.invoke(MarkupEvent(Markup.Type.BACKGROUND_COLOR, content.range()))
-                        mode.finish()
-                    }
-                }
-                else -> {
-                    event.invoke(MarkupEvent(type, content.range()))
-                }
-            }
-        }
-    }
-
-    private fun removeActionModeListener() {
-        actionMenu.removeListener()
-    }
-
-    // ------------ PAYLOADS ----------------
-    private fun payloadText(
-        payload: BlockViewDiffUtil.Payload,
-        item: Item,
-        clicked: (ListenerType) -> Unit
-    ) {
-        if (payload.isTextChanged) {
-            val markup = item as? Markup
-            content.pauseTextWatchers {
-                setText(
-                    text = item.text,
-                    clicked = clicked,
-                    markup = markup,
-                    textColor = item.getBlockTextColor()
-                )
-            }
-        }
-        if (payload.isMarkupChanged) {
-            content.text?.let { editable ->
-                val markup = item as? Markup
-                updateEditableMarkup(editable = editable, markup = markup, clicked = clicked)
-            }
-        }
-        if (payload.isTextColorChanged) {
-            setTextColor(item.getBlockTextColor())
-        }
-        if (payload.isBackgroundColorChanged) {
-            setBackgroundColor(item.backgroundColor)
-        }
-        if (payload.isCursorChanged) {
-            (item as? BlockView.Cursor)?.let {
-                setCursor(it)
-            }
-        }
-    }
-
-    private fun payloadPermission(
-        payload: BlockViewDiffUtil.Payload,
-        item: BlockView.Permission
-    ) {
-        if (payload.isModeChanged) {
-            when (item.mode) {
-                BlockView.Mode.READ -> enableReadMode()
-                BlockView.Mode.EDIT -> enableEditMode()
-            }
-        }
-    }
-
-    private fun payloadFocusable(
-        payload: BlockViewDiffUtil.Payload,
-        item: Focusable
-    ) {
-        if (payload.isFocusChanged) {
-            setFocus(item.isFocused)
-        }
-    }
-
-    open fun payload(
-        payloads: List<BlockViewDiffUtil.Payload>,
-        item: Item,
-        clicked: (ListenerType) -> Unit
-    ) = payloads.forEach { payload ->
-        payloadText(payload, item, clicked)
-        payloadPermission(payload, item)
-        payloadFocusable(payload, item)
-    }
-}
-
-*/

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/TextBlockHolder.kt

@@ -17,8 +17,8 @@ import com.anytypeio.anytype.core_ui.common.setMarkup
 import com.anytypeio.anytype.core_ui.common.toSpannable
 import com.anytypeio.anytype.core_ui.extensions.applyMovementMethod
 import com.anytypeio.anytype.core_ui.extensions.cursorYBottomCoordinate
-import com.anytypeio.anytype.core_ui.extensions.lighter
-import com.anytypeio.anytype.core_ui.extensions.resolveThemedColor
+import com.anytypeio.anytype.core_ui.extensions.resolveThemedTextColor
+import com.anytypeio.anytype.core_ui.extensions.setBlockBackgroundColor
 import com.anytypeio.anytype.core_ui.features.editor.holders.`interface`.TextHolder
 import com.anytypeio.anytype.core_ui.tools.DefaultSpannableFactory
 import com.anytypeio.anytype.core_ui.tools.DefaultTextWatcher
@@ -113,19 +113,7 @@ interface TextBlockHolder : TextHolder {
     }
 
     fun setBackgroundColor(color: String? = null) {
-        Timber.d("Setting background color: $color")
-        if (!color.isNullOrEmpty()) {
-            val value = ThemeColor.values().find { value -> value.title == color }
-            if (value != null && value != ThemeColor.DEFAULT) {
-                root.setBackgroundColor(root.resources.lighter(value, 0))
-            } else {
-                Timber.e("Could not find value for background color: $color, setting background to null")
-                root.background = null
-            }
-        } else {
-            Timber.d("Background color is null, setting background to null")
-            root.background = null
-        }
+        root.setBlockBackgroundColor(color)
     }
 
     fun setMarkup(markup: Markup, clicked: (ListenerType) -> Unit, textColor: Int) {
@@ -391,7 +379,7 @@ interface TextBlockHolder : TextHolder {
     }
 
     fun resolveTextBlockThemedColor(color: String?): Int {
-        return content.context.resolveThemedColor(color, getDefaultTextColor())
+        return content.context.resolveThemedTextColor(color, getDefaultTextColor())
     }
 
     //region CONTEXT MENU

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/media/Media.kt

@@ -2,17 +2,13 @@ package com.anytypeio.anytype.core_ui.features.editor.holders.media
 
 import android.annotation.SuppressLint
 import android.view.View
-import com.anytypeio.anytype.core_ui.extensions.lighter
+import com.anytypeio.anytype.core_ui.extensions.setBlockBackgroundColor
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder
 import com.anytypeio.anytype.core_ui.features.editor.EditorTouchProcessor
 import com.anytypeio.anytype.core_ui.features.editor.SupportCustomTouchProcessor
-import com.anytypeio.anytype.core_utils.ext.PopupExtensions
-import com.anytypeio.anytype.presentation.editor.editor.BlockDimensions
-import com.anytypeio.anytype.presentation.editor.editor.ThemeColor
 import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType
 import com.anytypeio.anytype.presentation.editor.editor.model.BlockView
-import timber.log.Timber
 
 @SuppressLint("ClickableViewAccessibility")
 abstract class Media(view: View) : BlockViewHolder(view),
@@ -51,34 +47,7 @@ abstract class Media(view: View) : BlockViewHolder(view),
         }
     }
 
-    private fun mediaLongClick(root: View, target: String, clicked: (ListenerType) -> Unit) {
-        val rect = PopupExtensions.calculateRectInWindow(root)
-        val dimensions = BlockDimensions(
-            left = rect.left,
-            top = rect.top,
-            bottom = rect.bottom,
-            right = rect.right,
-            height = root.height,
-            width = root.width
-        )
-        clicked(ListenerType.LongClick(target, dimensions))
-    }
-
-    protected fun applyBackground(
-        background: String?
-    ) {
-        Timber.d("Setting background color: $background")
-        if (!background.isNullOrEmpty()) {
-            val value = ThemeColor.values().find { value -> value.title == background }
-            if (value != null && value != ThemeColor.DEFAULT) {
-                container.setBackgroundColor(itemView.resources.lighter(value, 0))
-            } else {
-                Timber.e("Could not find value for background color: $background, setting background to null")
-                container.setBackgroundColor(0)
-            }
-        } else {
-            Timber.d("Background color is null, setting background to null")
-            container.setBackgroundColor(0)
-        }
+    protected fun applyBackground(background: String?) {
+        container.setBlockBackgroundColor(background)
     }
 }

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Code.kt

@@ -214,7 +214,6 @@ class Code(val binding: ItemBlockCodeSnippetBinding) : BlockViewHolder(binding.r
     }
 
     private fun setBackgroundColor(color: String? = null) {
-        Timber.d("Setting background color: $color")
         val value = ThemeColor.values().find { value -> value.title == color }
         if (value != null && value != ThemeColor.DEFAULT) {
             (root.background as? ColorDrawable)?.color = root.resources.lighter(value, 0)

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Divider.kt

@@ -4,15 +4,13 @@ import android.view.View
 import android.widget.FrameLayout
 import androidx.core.view.updateLayoutParams
 import com.anytypeio.anytype.core_ui.R
-import com.anytypeio.anytype.core_ui.extensions.lighter
+import com.anytypeio.anytype.core_ui.extensions.setBlockBackgroundColor
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder
 import com.anytypeio.anytype.core_ui.features.editor.EditorTouchProcessor
 import com.anytypeio.anytype.core_ui.features.editor.SupportCustomTouchProcessor
 import com.anytypeio.anytype.core_utils.ext.dimen
-import com.anytypeio.anytype.presentation.editor.editor.ThemeColor
 import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType
 import com.anytypeio.anytype.presentation.editor.editor.model.BlockView
-import timber.log.Timber
 
 abstract class Divider(view: View) : BlockViewHolder(view),
     BlockViewHolder.IndentableHolder,
@@ -50,21 +48,7 @@ abstract class Divider(view: View) : BlockViewHolder(view),
         }
     }
 
-    private fun applyBackground(
-        background: String?
-    ) {
-        Timber.d("Setting background color: $background")
-        if (!background.isNullOrEmpty()) {
-            val value = ThemeColor.values().find { value -> value.title == background }
-            if (value != null && value != ThemeColor.DEFAULT) {
-                root.setBackgroundColor(itemView.resources.lighter(value, 0))
-            } else {
-                Timber.e("Could not find value for background color: $background, setting background to null")
-                root.setBackgroundColor(0)
-            }
-        } else {
-            Timber.d("Background color is null, setting background to null")
-            root.setBackgroundColor(0)
-        }
+    private fun applyBackground(background: String?) {
+        root.setBlockBackgroundColor(background)
     }
 }

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/Latex.kt

@@ -4,11 +4,10 @@ import android.view.View
 import androidx.core.view.updatePadding
 import com.anytypeio.anytype.core_ui.R
 import com.anytypeio.anytype.core_ui.databinding.ItemBlockLatexBinding
-import com.anytypeio.anytype.core_ui.extensions.lighter
+import com.anytypeio.anytype.core_ui.extensions.setBlockBackgroundColor
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder
 import com.anytypeio.anytype.core_utils.ext.dimen
-import com.anytypeio.anytype.presentation.editor.editor.ThemeColor
 import com.anytypeio.anytype.presentation.editor.editor.model.BlockView
 import com.judemanutd.katexview.KatexView
 
@@ -42,12 +41,7 @@ class Latex(
     }
 
     private fun setBackground(backgroundColor: String?) {
-        val value = ThemeColor.values().find { it.title == backgroundColor }
-        if (value != null && value != ThemeColor.DEFAULT) {
-            itemView.setBackgroundColor(itemView.resources.lighter(value, 0))
-        } else {
-            itemView.background = null
-        }
+        itemView.setBlockBackgroundColor(backgroundColor)
     }
 
     fun processChangePayload(

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/LinkToObject.kt

@@ -10,18 +10,20 @@ import com.anytypeio.anytype.core_ui.R
 import com.anytypeio.anytype.core_ui.common.SearchHighlightSpan
 import com.anytypeio.anytype.core_ui.common.SearchTargetHighlightSpan
 import com.anytypeio.anytype.core_ui.databinding.ItemBlockObjectLinkBinding
-import com.anytypeio.anytype.core_ui.extensions.lighter
-import com.anytypeio.anytype.core_ui.features.editor.*
+import com.anytypeio.anytype.core_ui.extensions.setBlockBackgroundColor
+import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil
+import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder
+import com.anytypeio.anytype.core_ui.features.editor.EditorTouchProcessor
+import com.anytypeio.anytype.core_ui.features.editor.SupportCustomTouchProcessor
+import com.anytypeio.anytype.core_ui.features.editor.SupportNesting
 import com.anytypeio.anytype.core_utils.ext.dimen
 import com.anytypeio.anytype.core_utils.ext.gone
 import com.anytypeio.anytype.core_utils.ext.removeSpans
 import com.anytypeio.anytype.core_utils.ext.visible
-import com.anytypeio.anytype.presentation.editor.editor.ThemeColor
 import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType
 import com.anytypeio.anytype.presentation.editor.editor.model.BlockView
 import com.anytypeio.anytype.presentation.editor.editor.model.BlockView.Searchable.Field.Companion.DEFAULT_SEARCH_FIELD_KEY
 import com.anytypeio.anytype.presentation.objects.ObjectIcon
-import timber.log.Timber
 
 class LinkToObject(
     val binding: ItemBlockObjectLinkBinding
@@ -155,21 +157,7 @@ class LinkToObject(
         }
     }
 
-    private fun applyBackground(
-        background: String?
-    ) {
-        Timber.d("Setting background color: $background")
-        if (!background.isNullOrEmpty()) {
-            val value = ThemeColor.values().find { value -> value.title == background }
-            if (value != null && value != ThemeColor.DEFAULT) {
-                root.setBackgroundColor(itemView.resources.lighter(value, 0))
-            } else {
-                Timber.e("Could not find value for background color: $background, setting background to null")
-                root.setBackgroundColor(0)
-            }
-        } else {
-            Timber.d("Background color is null, setting background to null")
-            root.setBackgroundColor(0)
-        }
+    private fun applyBackground(background: String?) {
+        root.setBlockBackgroundColor(background)
     }
 }

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/LinkToObjectCard.kt

@@ -9,20 +9,22 @@ import com.anytypeio.anytype.core_ui.R
 import com.anytypeio.anytype.core_ui.common.SearchHighlightSpan
 import com.anytypeio.anytype.core_ui.common.SearchTargetHighlightSpan
 import com.anytypeio.anytype.core_ui.databinding.ItemBlockObjectLinkCardBinding
-import com.anytypeio.anytype.core_ui.extensions.lighter
-import com.anytypeio.anytype.core_ui.features.editor.*
+import com.anytypeio.anytype.core_ui.extensions.setBlockBackgroundColor
+import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil
+import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder
+import com.anytypeio.anytype.core_ui.features.editor.EditorTouchProcessor
+import com.anytypeio.anytype.core_ui.features.editor.SupportCustomTouchProcessor
+import com.anytypeio.anytype.core_ui.features.editor.SupportNesting
 import com.anytypeio.anytype.core_utils.ext.dimen
 import com.anytypeio.anytype.core_utils.ext.gone
 import com.anytypeio.anytype.core_utils.ext.removeSpans
 import com.anytypeio.anytype.core_utils.ext.visible
 import com.anytypeio.anytype.presentation.editor.cover.CoverColor
 import com.anytypeio.anytype.presentation.editor.cover.CoverGradient
-import com.anytypeio.anytype.presentation.editor.editor.ThemeColor
 import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType
 import com.anytypeio.anytype.presentation.editor.editor.model.BlockView
 import com.anytypeio.anytype.presentation.objects.ObjectIcon
 import com.bumptech.glide.Glide
-import timber.log.Timber
 
 class LinkToObjectCard(binding: ItemBlockObjectLinkCardBinding) :
     BlockViewHolder(binding.root),
@@ -233,22 +235,8 @@ class LinkToObjectCard(binding: ItemBlockObjectLinkCardBinding) :
         }
     }
 
-    private fun applyBackground(
-        background: String?
-    ) {
-        Timber.d("Setting background color: $background")
-        if (!background.isNullOrEmpty()) {
-            val value = ThemeColor.values().find { value -> value.title == background }
-            if (value != null && value != ThemeColor.DEFAULT) {
-                container.setBackgroundColor(itemView.resources.lighter(value, 0))
-            } else {
-                Timber.e("Could not find value for background color: $background, setting background to null")
-                container.setBackgroundColor(0)
-            }
-        } else {
-            Timber.d("Background color is null, setting background to null")
-            container.setBackgroundColor(0)
-        }
+    private fun applyBackground(background: String?) {
+        container.setBlockBackgroundColor(background)
     }
 
     private fun applyRootMargins(item: BlockView.LinkToObject.Default.Card) {

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/other/TableOfContents.kt

@@ -5,7 +5,7 @@ import android.widget.LinearLayout
 import androidx.core.view.ViewCompat.generateViewId
 import com.anytypeio.anytype.core_ui.R
 import com.anytypeio.anytype.core_ui.databinding.ItemBlockTocBinding
-import com.anytypeio.anytype.core_ui.extensions.lighter
+import com.anytypeio.anytype.core_ui.extensions.setBlockBackgroundColor
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.BACKGROUND_COLOR_CHANGED
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewDiffUtil.Companion.SELECTION_CHANGED
@@ -13,10 +13,8 @@ import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder
 import com.anytypeio.anytype.core_ui.features.editor.EditorTouchProcessor
 import com.anytypeio.anytype.core_ui.features.editor.SupportCustomTouchProcessor
 import com.anytypeio.anytype.core_ui.widgets.text.TableOfContentsItemWidget
-import com.anytypeio.anytype.presentation.editor.editor.ThemeColor
 import com.anytypeio.anytype.presentation.editor.editor.listener.ListenerType
 import com.anytypeio.anytype.presentation.editor.editor.model.BlockView
-import timber.log.Timber
 
 class TableOfContents(
     val binding: ItemBlockTocBinding
@@ -56,22 +54,8 @@ class TableOfContents(
         applyBackground(item.backgroundColor)
     }
 
-    private fun applyBackground(
-        background: String?
-    ) {
-        Timber.d("Setting background color: $background")
-        if (!background.isNullOrEmpty()) {
-            val value = ThemeColor.values().find { value -> value.title == background }
-            if (value != null && value != ThemeColor.DEFAULT) {
-                root.setBackgroundColor(itemView.resources.lighter(value, 0))
-            } else {
-                Timber.e("Could not find value for background color: $background, setting background to null")
-                root.setBackgroundColor(0)
-            }
-        } else {
-            Timber.d("Background color is null, setting background to null")
-            container.setBackgroundColor(0)
-        }
+    private fun applyBackground(background: String?) {
+        root.setBlockBackgroundColor(background)
     }
 
     private fun getPadding(depth: Int): Int {

core-ui/src/main/java/com/anytypeio/anytype/core_ui/features/editor/holders/relations/RelationViewHolder.kt

@@ -9,8 +9,15 @@ import androidx.core.view.updatePadding
 import androidx.viewbinding.ViewBinding
 import com.anytypeio.anytype.core_models.Relation
 import com.anytypeio.anytype.core_ui.R
-import com.anytypeio.anytype.core_ui.databinding.*
+import com.anytypeio.anytype.core_ui.databinding.ItemBlockRelationFileBinding
+import com.anytypeio.anytype.core_ui.databinding.ItemBlockRelationObjectBinding
+import com.anytypeio.anytype.core_ui.databinding.ItemBlockRelationPlaceholderBinding
+import com.anytypeio.anytype.core_ui.databinding.ItemBlockRelationTagBinding
+import com.anytypeio.anytype.core_ui.databinding.ItemRelationListRelationFileBinding
+import com.anytypeio.anytype.core_ui.databinding.ItemRelationListRelationObjectBinding
+import com.anytypeio.anytype.core_ui.databinding.ItemRelationListRelationTagBinding
 import com.anytypeio.anytype.core_ui.extensions.dark
+import com.anytypeio.anytype.core_ui.extensions.setBlockBackgroundColor
 import com.anytypeio.anytype.core_ui.features.editor.BlockViewHolder
 import com.anytypeio.anytype.core_ui.widgets.GridCellFileItem
 import com.anytypeio.anytype.core_ui.widgets.RelationObjectItem
@@ -22,7 +29,6 @@ import com.anytypeio.anytype.presentation.editor.editor.ThemeColor
 import com.anytypeio.anytype.presentation.editor.editor.model.BlockView
 import com.anytypeio.anytype.presentation.relations.DocumentRelationView
 import com.anytypeio.anytype.presentation.sets.model.ObjectView
-import timber.log.Timber
 
 sealed class RelationViewHolder(
     view: View
@@ -43,16 +49,7 @@ sealed class RelationViewHolder(
     }
 
     fun setBackgroundColor(color: String? = null) {
-        Timber.d("Setting background color: $color")
-        if (color != null) {
-            val value = ThemeColor.values().find { value -> value.title == color }
-            if (value != null)
-                itemView.setBackgroundColor(value.background)
-            else
-                Timber.e("Could not find value for background color: $color")
-        } else {
-            itemView.background = null
-        }
+        itemView.setBlockBackgroundColor(color)
     }
 
     class Placeholder(val binding: ItemBlockRelationPlaceholderBinding) : RelationViewHolder(binding.root) {