Connect format option buttons to their respective action

Author: LunarX

app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageEditorManager.kt

@@ -20,6 +20,7 @@ package com.infomaniak.mail.ui.newMessage
 import android.content.res.ColorStateList
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.lifecycle.lifecycleScope
 import com.google.android.material.button.MaterialButton
 import com.infomaniak.mail.MatomoMail
 import com.infomaniak.mail.MatomoMail.trackEvent
@@ -28,6 +29,7 @@ import com.infomaniak.mail.databinding.FragmentNewMessageBinding
 import com.infomaniak.mail.utils.extensions.getAttributeColor
 import com.infomaniak.mail.utils.extensions.notYetImplemented
 import dagger.hilt.android.scopes.FragmentScoped
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 import com.google.android.material.R as RMaterial
 
@@ -57,19 +59,19 @@ class NewMessageEditorManager @Inject constructor() : NewMessageManager() {
         _openFilePicker = openFilePicker
     }
 
-    fun observeEditorActions() {
+    fun observeEditorActions() = with(binding) {
         newMessageViewModel.editorAction.observe(viewLifecycleOwner) { (editorAction, _) ->
             when (editorAction) {
                 EditorAction.ATTACHMENT -> _openFilePicker?.invoke()
                 EditorAction.CAMERA -> fragment.notYetImplemented()
                 EditorAction.LINK -> fragment.notYetImplemented()
                 EditorAction.CLOCK -> fragment.notYetImplemented()
                 EditorAction.AI -> aiManager.openAiPrompt()
-                EditorAction.BOLD -> {}
-                EditorAction.ITALIC -> {}
-                EditorAction.UNDERLINE -> {}
-                EditorAction.STRIKE_THROUGH -> {}
-                EditorAction.UNORDERED_LIST -> {}
+                EditorAction.BOLD -> editorWebView.toggleBold()
+                EditorAction.ITALIC -> editorWebView.toggleItalic()
+                EditorAction.UNDERLINE -> editorWebView.toggleUnderline()
+                EditorAction.STRIKE_THROUGH -> editorWebView.toggleStrikeThrough()
+                EditorAction.UNORDERED_LIST -> editorWebView.toggleUnorderedList()
             }
         }
     }
@@ -120,6 +122,18 @@ class NewMessageEditorManager @Inject constructor() : NewMessageManager() {
         textEditing.isVisible = isEditorExpanded
     }
 
+    fun observeEditorStatus(): Unit = with(binding) {
+        viewLifecycleOwner.lifecycleScope.launch {
+            editorWebView.editorStatusesFlow.collect {
+                buttonBold.isActivated = it.isBold
+                buttonItalic.isActivated = it.isItalic
+                buttonUnderline.isActivated = it.isUnderlined
+                buttonStrikeThrough.isActivated = it.isStrikeThrough
+                buttonList.isActivated = it.isUnorderedListSelected
+            }
+        }
+    }
+
     enum class EditorAction(val matomoValue: String) {
         ATTACHMENT("importFile"),
         CAMERA("importFromCamera"),

app/src/main/java/com/infomaniak/mail/ui/newMessage/NewMessageFragment.kt

@@ -47,6 +47,7 @@ import com.infomaniak.lib.core.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.lib.core.utils.getBackNavigationResult
 import com.infomaniak.lib.core.utils.isNightModeEnabled
 import com.infomaniak.lib.core.utils.showToast
+import com.infomaniak.lib.richhtmleditor.StatusCommand.*
 import com.infomaniak.mail.MatomoMail.OPEN_FROM_DRAFT_NAME
 import com.infomaniak.mail.MatomoMail.trackAttachmentActionsEvent
 import com.infomaniak.mail.MatomoMail.trackNewMessageEvent
@@ -191,6 +192,7 @@ class NewMessageFragment : Fragment() {
         observeShimmering()
 
         editorManager.observeEditorActions()
+        editorManager.observeEditorStatus()
         externalsManager.observeExternals(newMessageViewModel.arrivedFromExistingDraft())
 
         with(aiManager) {
@@ -350,6 +352,8 @@ class NewMessageFragment : Fragment() {
 
     private fun initEditorUi() {
         binding.editorWebView.apply {
+            subscribeToStates(setOf(BOLD, ITALIC, UNDERLINE, STRIKE_THROUGH, UNORDERED_LIST))
+
             enableAlgorithmicDarkening(isEnabled = true)
             if (context.isNightModeEnabled()) addCss(context.loadCss(R.raw.custom_dark_mode))