Don't display the editor's placeholder while the screen is shimmering

Author: LunarX

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

@@ -78,9 +78,11 @@ import com.infomaniak.mail.utils.extensions.AttachmentExtensions.openAttachment
 import dagger.hilt.android.AndroidEntryPoint
 import io.sentry.Sentry
 import io.sentry.SentryLevel
+import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.filterNotNull
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
 import javax.inject.Inject
 
 @AndroidEntryPoint
@@ -175,6 +177,7 @@ class NewMessageFragment : Fragment() {
         observeBodyLoader()
         observeUiSignature()
         observeUiQuote()
+        observeShimmering()
 
         editorManager.observeEditorActions()
         externalsManager.observeExternals(newMessageViewModel.arrivedFromExistingDraft())
@@ -192,6 +195,26 @@ class NewMessageFragment : Fragment() {
         }
     }
 
+    private fun observeShimmering() {
+        lifecycleScope.launch {
+            newMessageViewModel.isShimmering.collect(::setShimmerVisibility)
+        }
+    }
+
+    private fun setShimmerVisibility(isShimmering: Boolean) = with(binding) {
+        fromMailAddress.isGone = isShimmering
+        subjectTextField.isGone = isShimmering
+        editor.isGone = isShimmering
+
+        fromLoader.isVisible = isShimmering
+        subjectLoader.isVisible = isShimmering
+        bodyLoader.isVisible = isShimmering
+
+        toField.setShimmerVisibility(isShimmering)
+        ccField.setShimmerVisibility(isShimmering)
+        bccField.setShimmerVisibility(isShimmering)
+    }
+
     private fun initManagers() {
         aiManager.initValues(
             newMessageViewModel = newMessageViewModel,
@@ -311,9 +334,13 @@ class NewMessageFragment : Fragment() {
             addCss(context.readRawResource(R.raw.style))
             addCss(context.readRawResource(R.raw.editor_style))
 
-            isEmptyFlow
-                .filterNotNull()
-                .onEach { isEditorEmpty -> newMessagePlaceholder.isVisible = isEditorEmpty }
+            val isPlaceholderVisible = combine(
+                isEmptyFlow.filterNotNull(),
+                newMessageViewModel.isShimmering,
+            ) { isEditorEmpty, isShimmering -> isEditorEmpty && !isShimmering }
+
+            isPlaceholderVisible
+                .onEach { isVisible -> newMessagePlaceholder.isVisible = isVisible }
                 .launchIn(lifecycleScope)
         }
 
@@ -342,21 +369,6 @@ class NewMessageFragment : Fragment() {
         }
     }
 
-    private fun hideLoader() = with(binding) {
-
-        fromMailAddress.isVisible = true
-        subjectTextField.isVisible = true
-        editor.isVisible = true
-
-        fromLoader.isGone = true
-        subjectLoader.isGone = true
-        bodyLoader.isGone = true
-
-        toField.hideLoader()
-        ccField.hideLoader()
-        bccField.hideLoader()
-    }
-
     private fun showKeyboardInCorrectView(isToFieldEmpty: Boolean) = with(recipientFieldsManager) {
         when (newMessageViewModel.draftMode()) {
             DraftMode.REPLY,
@@ -460,7 +472,6 @@ class NewMessageFragment : Fragment() {
 
     private fun observeInitResult() {
         newMessageViewModel.initResult.observe(viewLifecycleOwner) { (draft, signatures) ->
-            hideLoader()
             configureUiWithDraftData(draft)
             setupFromField(signatures)
             editorManager.setupEditorActions()

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

@@ -79,6 +79,8 @@ import kotlinx.coroutines.*
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.Channel.Factory.CONFLATED
 import kotlinx.coroutines.channels.ReceiveChannel
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.map
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
@@ -145,6 +147,9 @@ class NewMessageViewModel @Inject constructor(
     // Needs to trigger every time the Fragment is recreated
     val initResult = MutableLiveData<InitResult>()
 
+    private val _isShimmering = MutableStateFlow(true)
+    val isShimmering: StateFlow<Boolean> = _isShimmering
+
     val currentMailbox by lazy { mailboxController.getMailbox(AccountUtils.currentUserId, AccountUtils.currentMailboxId)!! }
 
     val currentMailboxLive = mailboxController.getMailboxAsync(
@@ -217,6 +222,7 @@ class NewMessageViewModel @Inject constructor(
             realm.writeBlocking { draftController.upsertDraft(it, realm = this) }
             it.saveSnapshot(it.uiBody.content)
             it.initLiveData(signatures)
+            _isShimmering.emit(false)
 
             initResult.postValue(InitResult(it, signatures))
         }

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

@@ -164,11 +164,11 @@ class RecipientFieldView @JvmOverloads constructor(
         }
     }
 
-    fun hideLoader() = with(binding) {
-        textInput.isVisible = true
-        chevronContainer.isVisible = true
+    fun setShimmerVisibility(isShimmering: Boolean) = with(binding) {
+        textInput.isGone = isShimmering
+        chevronContainer.isGone = isShimmering
 
-        loader.isGone = true
+        loader.isVisible = isShimmering
     }
 
     fun showKeyboardInTextInput() {