Merge pull request #1650 from Infomaniak/bars-color

Fix wrong SystemBars colors

Author: LunarX

.idea/navEditor.xml

@@ -306,7 +306,7 @@ class MainActivity : BaseActivity() {
         )
     }
 
-    // Still display the snackbar even if it took three times 10 seconds of timeout to succeed
+    // Still display the Snackbar even if it took three times 10 seconds of timeout to succeed
     private fun showSentDraftSnackbar() {
         showSendingSnackbarTimer.cancel()
         snackbarManager.setValue(getString(R.string.snackbarEmailSent))
@@ -433,45 +433,12 @@ class MainActivity : BaseActivity() {
     // This `SuppressLint` seems useless, but it's for the CI. Don't remove it.
     @SuppressLint("RestrictedApi")
     private fun onDestinationChanged(destination: NavDestination, arguments: Bundle?) {
-
         SentryDebug.addNavigationBreadcrumb(destination.displayName, arguments)
         trackDestination(destination)
-
-        updateColorsWhenDestinationChanged(destination.id)
         setDrawerLockMode(isLocked = destination.id != R.id.threadListFragment)
-
         previousDestinationId = destination.id
     }
 
-    private fun updateColorsWhenDestinationChanged(destinationId: Int) {
-
-        when (destinationId) {
-            R.id.junkBottomSheetDialog,
-            R.id.messageActionsBottomSheetDialog,
-            R.id.replyBottomSheetDialog,
-            R.id.detailedContactBottomSheetDialog,
-            R.id.threadActionsBottomSheetDialog,
-            R.id.attachmentActionsBottomSheetDialog,
-            R.id.downloadAttachmentProgressDialog,
-            R.id.attendeesBottomSheetDialog -> null
-            R.id.searchFragment -> R.color.backgroundColor
-            else -> R.color.backgroundHeaderColor
-        }?.let { statusBarColor ->
-            window.statusBarColor = getColor(statusBarColor)
-        }
-
-        when (destinationId) {
-            R.id.messageActionsBottomSheetDialog,
-            R.id.replyBottomSheetDialog,
-            R.id.detailedContactBottomSheetDialog,
-            R.id.threadActionsBottomSheetDialog -> R.color.backgroundColorSecondary
-            R.id.threadListFragment -> if (mainViewModel.isMultiSelectOn) R.color.elevatedBackground else R.color.backgroundColor
-            else -> R.color.backgroundColor
-        }.let { navigationBarColor ->
-            window.updateNavigationBarColor(getColor(navigationBarColor))
-        }
-    }
-
     fun setDrawerLockMode(isLocked: Boolean) {
         val drawerLockMode = if (isLocked) DrawerLayout.LOCK_MODE_LOCKED_CLOSED else DrawerLayout.LOCK_MODE_UNLOCKED
         binding.drawerLayout.setDrawerLockMode(drawerLockMode)

app/src/main/java/com/infomaniak/mail/ui/MainActivity.kt

@@ -28,7 +28,6 @@ import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.activityViewModels
 import com.infomaniak.lib.core.utils.SnackbarUtils.showSnackbar
-import com.infomaniak.lib.core.utils.context
 import com.infomaniak.lib.core.utils.safeBinding
 import com.infomaniak.lib.login.InfomaniakLogin
 import com.infomaniak.mail.BuildConfig
@@ -39,6 +38,7 @@ import com.infomaniak.mail.databinding.FragmentNewAccountBinding
 import com.infomaniak.mail.di.IoDispatcher
 import com.infomaniak.mail.di.MainDispatcher
 import com.infomaniak.mail.utils.LoginUtils
+import com.infomaniak.mail.utils.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Inject
@@ -81,7 +81,7 @@ class NewAccountFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) {
         super.onViewCreated(view, savedInstanceState)
-        requireActivity().window.statusBarColor = context.getColor(R.color.backgroundColor)
+        setSystemBarsColors(statusBarColor = R.color.backgroundColor)
 
         selectIllustrationAccordingToTheme()
 

app/src/main/java/com/infomaniak/mail/ui/login/NewAccountFragment.kt

@@ -17,7 +17,6 @@
  */
 package com.infomaniak.mail.ui.main.folder
 
-import android.content.res.Configuration
 import android.os.Bundle
 import android.os.CountDownTimer
 import android.text.format.DateUtils
@@ -133,6 +132,10 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         navigateFromNotificationToNewMessage()
 
         super.onViewCreated(view, savedInstanceState)
+        setSystemBarsColors(
+            statusBarColor = R.color.backgroundHeaderColor,
+            navigationBarColor = if (mainViewModel.isMultiSelectOn) R.color.elevatedBackground else R.color.backgroundColor,
+        )
 
         threadListViewModel.deleteSearchData()
         bindAlertToViewLifecycle(descriptionDialog)
@@ -225,17 +228,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         canRefreshThreads = true
     }
 
-    override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-
-        val statusBarColor = if (twoPaneViewModel.isThreadOpen && !canDisplayBothPanes()) {
-            R.color.backgroundColor
-        } else {
-            R.color.backgroundHeaderColor
-        }
-        requireActivity().window.statusBarColor = requireContext().getColor(statusBarColor)
-    }
-
     private fun refreshThreadsIfNotificationsAreDisabled() = with(mainViewModel) {
         val areGoogleServicesDisabled = !playServicesUtils.areGooglePlayServicesAvailable()
         val areAppNotifsDisabled = !notificationManagerCompat.areNotificationsEnabled()

app/src/main/java/com/infomaniak/mail/ui/main/folder/ThreadListFragment.kt

@@ -38,13 +38,13 @@ import com.infomaniak.mail.utils.AttachmentIntentUtils
 import com.infomaniak.mail.utils.UiUtils.FULLY_SLID
 import com.infomaniak.mail.utils.UiUtils.progressivelyColorSystemBars
 import com.infomaniak.mail.utils.safeNavigateToNewMessageActivity
-import com.infomaniak.mail.utils.updateNavigationBarColor
+import com.infomaniak.mail.utils.setSystemBarsColors
 import javax.inject.Inject
 
 abstract class TwoPaneFragment : Fragment() {
 
     val mainViewModel: MainViewModel by activityViewModels()
-    val twoPaneViewModel: TwoPaneViewModel by activityViewModels()
+    protected val twoPaneViewModel: TwoPaneViewModel by activityViewModels()
 
     protected abstract val slidingPaneLayout: NoAnimSlidingPaneLayout
 
@@ -120,8 +120,8 @@ abstract class TwoPaneFragment : Fragment() {
         twoPaneViewModel.currentThreadUid.observe(viewLifecycleOwner) { threadUid ->
             val isOpeningThread = threadUid != null
             if (isOpeningThread) {
-                val hasPaneOpened = slidingPaneLayout.openPaneNoAnimation()
-                if (hasPaneOpened) requireActivity().window.statusBarColor = requireContext().getColor(R.color.backgroundColor)
+                val hasOpened = slidingPaneLayout.openPaneNoAnimation()
+                if (hasOpened) setSystemBarsColors(statusBarColor = R.color.backgroundColor, navigationBarColor = null)
             } else {
                 resetPanes()
             }
@@ -157,13 +157,15 @@ abstract class TwoPaneFragment : Fragment() {
         }
     }
 
-    private fun resetPanes() = with(requireActivity()) {
+    private fun resetPanes() {
 
-        val isClosing = slidingPaneLayout.closePaneNoAnimation()
+        val hasClosed = slidingPaneLayout.closePaneNoAnimation()
 
-        if (isClosing) {
-            if (this@TwoPaneFragment is ThreadListFragment) window.statusBarColor = getColor(R.color.backgroundHeaderColor)
-            window.updateNavigationBarColor(getColor(R.color.backgroundColor))
+        if (hasClosed) {
+            setSystemBarsColors(
+                statusBarColor = if (this@TwoPaneFragment is ThreadListFragment) R.color.backgroundHeaderColor else null,
+                navigationBarColor = R.color.backgroundColor,
+            )
         }
 
         threadListAdapter.selectNewThread(newPosition = null, threadUid = null)

app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneFragment.kt

@@ -17,6 +17,7 @@
  */
 package com.infomaniak.mail.ui.main.folder
 
+import android.content.Context
 import android.net.Uri
 import android.os.Bundle
 import androidx.annotation.IdRes
@@ -31,6 +32,7 @@ import com.infomaniak.mail.data.models.message.Message
 import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.ui.newMessage.NewMessageActivityArgs
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
+import com.infomaniak.mail.utils.canDisplayBothPanes
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -92,6 +94,8 @@ class TwoPaneViewModel @Inject constructor(
         )
     }
 
+    fun isInThreadInPhoneMode(context: Context): Boolean = isThreadOpen && !context.canDisplayBothPanes()
+
     data class NavData(
         @IdRes val resId: Int,
         val args: Bundle,

app/src/main/java/com/infomaniak/mail/ui/main/folder/TwoPaneViewModel.kt

@@ -40,6 +40,7 @@ import com.infomaniak.mail.data.models.Folder.FolderRole
 import com.infomaniak.mail.databinding.FragmentMoveBinding
 import com.infomaniak.mail.utils.handleEditorSearchAction
 import com.infomaniak.mail.utils.setOnClearTextClickListener
+import com.infomaniak.mail.utils.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -72,6 +73,8 @@ class MoveFragment : MenuFoldersFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setSystemBarsColors()
+
         setupListeners()
         setupFolderAdapters()
         setupCreateFolderDialog()

app/src/main/java/com/infomaniak/mail/ui/main/menu/MoveFragment.kt

@@ -51,11 +51,8 @@ import com.infomaniak.mail.ui.main.NoAnimSlidingPaneLayout
 import com.infomaniak.mail.ui.main.folder.TwoPaneFragment
 import com.infomaniak.mail.ui.main.search.SearchFolderAdapter.SearchFolderElement
 import com.infomaniak.mail.ui.main.thread.ThreadFragment
+import com.infomaniak.mail.utils.*
 import com.infomaniak.mail.utils.RealmChangesBinding.Companion.bindResultsChangeToAdapter
-import com.infomaniak.mail.utils.addStickyDateDecoration
-import com.infomaniak.mail.utils.getLocalizedNameOrAllFolders
-import com.infomaniak.mail.utils.handleEditorSearchAction
-import com.infomaniak.mail.utils.setOnClearTextClickListener
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -102,6 +99,7 @@ class SearchFragment : TwoPaneFragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
+        setSystemBarsColors(statusBarColor = R.color.backgroundColor)
 
         searchViewModel.executePendingSearch()
 

app/src/main/java/com/infomaniak/mail/ui/main/search/SearchFragment.kt

@@ -33,6 +33,7 @@ import com.infomaniak.mail.data.LocalSettings
 import com.infomaniak.mail.data.LocalSettings.AccentColor
 import com.infomaniak.mail.data.LocalSettings.AccentColor.*
 import com.infomaniak.mail.databinding.FragmentAccentColorSettingBinding
+import com.infomaniak.mail.utils.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -50,6 +51,7 @@ class AccentColorSettingFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding.radioGroup) {
         super.onViewCreated(view, savedInstanceState)
+        setSystemBarsColors()
 
         setSystemAccentUi()
 

app/src/main/java/com/infomaniak/mail/ui/main/settings/AccentColorSettingFragment.kt

@@ -30,6 +30,7 @@ import com.infomaniak.mail.data.LocalSettings.ExternalContent
 import com.infomaniak.mail.data.LocalSettings.ExternalContent.ALWAYS
 import com.infomaniak.mail.data.LocalSettings.ExternalContent.ASK_ME
 import com.infomaniak.mail.databinding.FragmentExternalContentSettingBinding
+import com.infomaniak.mail.utils.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
 
@@ -47,6 +48,7 @@ class ExternalContentSettingFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding.radioGroup) {
         super.onViewCreated(view, savedInstanceState)
+        setSystemBarsColors()
 
         initBijectionTable(
             R.id.always to ALWAYS,