chore: Remove statusBar and navigationBar color (#2656)

Author: tevincent

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

@@ -28,7 +28,6 @@ import androidx.activity.addCallback
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
 import androidx.activity.viewModels
-import androidx.annotation.FloatRange
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.view.isVisible
 import androidx.core.view.updatePadding
@@ -83,8 +82,6 @@ import com.infomaniak.mail.utils.NotificationUtils.Companion.GENERIC_NEW_MAILS_N
 import com.infomaniak.mail.utils.PermissionUtils
 import com.infomaniak.mail.utils.PlayServicesUtils
 import com.infomaniak.mail.utils.SentryDebug
-import com.infomaniak.mail.utils.UiUtils
-import com.infomaniak.mail.utils.UiUtils.progressivelyColorSystemBars
 import com.infomaniak.mail.utils.Utils.Shortcuts
 import com.infomaniak.mail.utils.Utils.openShortcutHelp
 import com.infomaniak.mail.utils.WorkerUtils
@@ -114,9 +111,6 @@ class MainActivity : BaseActivity() {
     private val binding by lazy { ActivityMainBinding.inflate(layoutInflater) }
     private val mainViewModel: MainViewModel by viewModels()
 
-    private val backgroundColor: Int by lazy { getColor(R.color.backgroundColor) }
-    private val backgroundHeaderColor: Int by lazy { getColor(R.color.backgroundHeaderColor) }
-    private val menuDrawerBackgroundColor: Int by lazy { getColor(R.color.menuDrawerBackgroundColor) }
     private val navigationArgs: MainActivityArgs? by lazy { intent?.extras?.let(MainActivityArgs::fromBundle) }
 
     private var previousDestinationId: Int? = null
@@ -183,13 +177,10 @@ class MainActivity : BaseActivity() {
 
         var hasDragged = false
 
-        override fun onDrawerSlide(drawerView: View, slideOffset: Float) {
-            colorSystemBarsWithMenuDrawer(slideOffset)
-        }
+        override fun onDrawerSlide(drawerView: View, slideOffset: Float) = Unit
 
         override fun onDrawerOpened(drawerView: View) {
             if (hasDragged) trackMenuDrawerEvent(MatomoName.OpenByGesture, TrackerAction.DRAG)
-            colorSystemBarsWithMenuDrawer(UiUtils.FULLY_SLID)
             binding.menuDrawerFragmentContainer.getFragment<MenuDrawerFragment?>()?.onDrawerOpened()
         }
 
@@ -457,7 +448,6 @@ class MainActivity : BaseActivity() {
         super.onResume()
         playServicesUtils.checkPlayServices(this)
         notificationManagerCompat.cancel(GENERIC_NEW_MAILS_NOTIFICATION_ID)
-        if (binding.drawerLayout.isOpen) colorSystemBarsWithMenuDrawer(UiUtils.FULLY_SLID)
     }
 
     private fun handleOnBackPressed() = with(binding) {
@@ -545,16 +535,6 @@ class MainActivity : BaseActivity() {
         binding.drawerLayout.setDrawerLockMode(drawerLockMode)
     }
 
-    private fun colorSystemBarsWithMenuDrawer(@FloatRange(0.0, 1.0) slideOffset: Float) {
-        window.progressivelyColorSystemBars(
-            slideOffset = slideOffset,
-            statusBarColorFrom = backgroundHeaderColor,
-            statusBarColorTo = menuDrawerBackgroundColor,
-            navBarColorFrom = backgroundColor,
-            navBarColorTo = menuDrawerBackgroundColor,
-        )
-    }
-
     private fun managePermissionsRequesting() {
         if (hasPermissions(PermissionUtils.getMainPermissions(mustRequireNotification = true))) return
 

app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/AccountBottomSheetDialog.kt

@@ -22,7 +22,6 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.activityViewModels
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.infomaniak.core.legacy.utils.context
 import com.infomaniak.core.legacy.utils.safeBinding
 import com.infomaniak.core.legacy.utils.safeNavigate
@@ -53,7 +52,7 @@ import java.util.Date
 import javax.inject.Inject
 
 @AndroidEntryPoint
-class AccountBottomSheetDialog : BottomSheetDialogFragment() {
+class AccountBottomSheetDialog : EdgeToEdgeBottomSheetDialog() {
 
     private var binding: BottomSheetAccountBinding by safeBinding()
 

app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/EdgeToEdgeBottomSheetDialog.kt

@@ -0,0 +1,32 @@
+/*
+ * Infomaniak Mail - Android
+ * Copyright (C) 2025 Infomaniak Network SA
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.infomaniak.mail.ui.bottomSheetDialogs
+
+import android.os.Build.VERSION.SDK_INT
+import android.os.Bundle
+import android.view.View
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+
+abstract class EdgeToEdgeBottomSheetDialog : BottomSheetDialogFragment() {
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        if (SDK_INT >= 29) dialog?.window?.isNavigationBarContrastEnforced = false
+    }
+}

app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/InformationBottomSheetDialog.kt

@@ -21,11 +21,10 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.infomaniak.core.legacy.utils.safeBinding
 import com.infomaniak.mail.databinding.BottomSheetInformationBinding
 
-open class InformationBottomSheetDialog : BottomSheetDialogFragment() {
+open class InformationBottomSheetDialog : EdgeToEdgeBottomSheetDialog() {
 
     protected var binding: BottomSheetInformationBinding by safeBinding()
 

app/src/main/java/com/infomaniak/mail/ui/bottomSheetDialogs/SelectScheduleOptionBottomSheet.kt

@@ -26,7 +26,6 @@ import androidx.annotation.IntRange
 import androidx.annotation.StringRes
 import androidx.core.view.children
 import androidx.core.view.isVisible
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.infomaniak.core.ksuite.data.KSuite
 import com.infomaniak.core.legacy.utils.context
 import com.infomaniak.core.legacy.utils.safeBinding
@@ -59,7 +58,7 @@ import java.util.Calendar
 import java.util.Date
 import kotlin.time.Duration.Companion.minutes
 
-abstract class SelectScheduleOptionBottomSheet : BottomSheetDialogFragment() {
+abstract class SelectScheduleOptionBottomSheet : EdgeToEdgeBottomSheetDialog() {
 
     private var binding: BottomSheetScheduleOptionsBinding by safeBinding()
 

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

@@ -30,7 +30,6 @@ import androidx.fragment.app.activityViewModels
 import com.infomaniak.core.legacy.utils.SnackbarUtils.showSnackbar
 import com.infomaniak.core.legacy.utils.safeBinding
 import com.infomaniak.lib.login.InfomaniakLogin
-import com.infomaniak.mail.BuildConfig
 import com.infomaniak.mail.CREATE_ACCOUNT_CANCEL_HOST
 import com.infomaniak.mail.CREATE_ACCOUNT_SUCCESS_HOST
 import com.infomaniak.mail.CREATE_ACCOUNT_URL
@@ -42,7 +41,6 @@ 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.extensions.setSystemBarsColors
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.CoroutineDispatcher
 import javax.inject.Inject
@@ -85,7 +83,6 @@ class NewAccountFragment : Fragment() {
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) = with(binding) {
         super.onViewCreated(view, savedInstanceState)
-        setSystemBarsColors(statusBarColor = R.color.backgroundColor)
 
         selectIllustrationAccordingToTheme()
 

app/src/main/java/com/infomaniak/mail/ui/main/emojiPicker/EmojiPickerBottomSheetDialog.kt

@@ -22,12 +22,12 @@ import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import androidx.navigation.fragment.navArgs
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.infomaniak.core.legacy.utils.safeBinding
 import com.infomaniak.core.legacy.utils.setBackNavigationResult
 import com.infomaniak.mail.databinding.FragmentEmojiPickerBinding
+import com.infomaniak.mail.ui.bottomSheetDialogs.EdgeToEdgeBottomSheetDialog
 
-class EmojiPickerBottomSheetDialog : BottomSheetDialogFragment() {
+class EmojiPickerBottomSheetDialog : EdgeToEdgeBottomSheetDialog() {
 
     private var binding: FragmentEmojiPickerBinding by safeBinding()
     private val navigationArgs: EmojiPickerBottomSheetDialogArgs by navArgs()

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

@@ -24,7 +24,6 @@ import android.transition.TransitionManager
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.appcompat.content.res.AppCompatResources.getDrawable
@@ -97,7 +96,6 @@ import com.infomaniak.mail.utils.extensions.bindAlertToViewLifecycle
 import com.infomaniak.mail.utils.extensions.observeNotNull
 import com.infomaniak.mail.utils.extensions.safeArea
 import com.infomaniak.mail.utils.extensions.safeNavigateToNewMessageActivity
-import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import com.infomaniak.mail.utils.extensions.shareString
 import com.infomaniak.mail.utils.extensions.toDate
 import dagger.hilt.android.AndroidEntryPoint
@@ -155,10 +153,6 @@ class ThreadListFragment : TwoPaneFragment() {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) = runCatchingRealm {
         navigateFromNotificationToNewMessage()
         super.onViewCreated(view, savedInstanceState)
-        setSystemBarsColors(
-            statusBarColor = R.color.backgroundHeaderColor,
-            navigationBarColor = if (mainViewModel.isMultiSelectOn) R.color.elevatedBackground else R.color.backgroundColor,
-        )
 
         handleEdgeToEdge()
 
@@ -196,9 +190,6 @@ class ThreadListFragment : TwoPaneFragment() {
         observeShareUrlResult()
     }.getOrDefault(Unit)
 
-    @ColorRes
-    override fun getStatusBarColor(): Int = R.color.backgroundHeaderColor
-
     override fun getLeftPane(): View? = _binding?.threadsConstraintLayout
 
     override fun getRightPane(): FragmentContainerView? = _binding?.threadHostFragment

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

@@ -22,7 +22,6 @@ import android.transition.TransitionManager
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.lifecycle.lifecycleScope
-import com.infomaniak.core.legacy.utils.context
 import com.infomaniak.core.legacy.utils.safeNavigate
 import com.infomaniak.dragdropswiperecyclerview.DragDropSwipeRecyclerView.ListOrientation.DirectionFlag
 import com.infomaniak.mail.MatomoMail.MatomoName
@@ -37,7 +36,6 @@ import com.infomaniak.mail.ui.MainViewModel
 import com.infomaniak.mail.utils.Utils.runCatchingRealm
 import com.infomaniak.mail.utils.extensions.archiveWithConfirmationPopup
 import com.infomaniak.mail.utils.extensions.deleteWithConfirmationPopup
-import com.infomaniak.mail.utils.extensions.updateNavigationBarColor
 import kotlinx.coroutines.launch
 
 class ThreadListMultiSelection {
@@ -171,8 +169,6 @@ class ThreadListMultiSelection {
     private fun displayMultiSelectActions(isMultiSelectOn: Boolean) = with(threadListFragment.binding) {
         newMessageFab.isGone = isMultiSelectOn
         quickActionBar.isVisible = isMultiSelectOn
-        val navBarColor = context.getColor(if (isMultiSelectOn) R.color.elevatedBackground else R.color.backgroundColor)
-        threadListFragment.requireActivity().window.updateNavigationBarColor(navBarColor)
     }
 
     private fun updateSelectedCount(selectedThreads: Set<Thread>) {

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

@@ -18,10 +18,10 @@
 package com.infomaniak.mail.ui.main.folder
 
 import android.content.res.Configuration
+import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import android.view.View
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
-import androidx.annotation.ColorRes
 import androidx.core.content.res.ResourcesCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
@@ -51,7 +51,6 @@ import com.infomaniak.mail.utils.extensions.isPhone
 import com.infomaniak.mail.utils.extensions.isTabletInLandscape
 import com.infomaniak.mail.utils.extensions.isTabletInPortrait
 import com.infomaniak.mail.utils.extensions.safeNavigateToNewMessageActivity
-import com.infomaniak.mail.utils.extensions.setSystemBarsColors
 import io.realm.kotlin.types.RealmInstant
 import javax.inject.Inject
 
@@ -70,9 +69,6 @@ abstract class TwoPaneFragment : Fragment() {
     lateinit var localSettings: LocalSettings
 
     abstract val substituteClassName: String
-
-    @ColorRes
-    abstract fun getStatusBarColor(): Int
     abstract fun getLeftPane(): View?
     abstract fun getRightPane(): FragmentContainerView?
     abstract fun getAnchor(): View?
@@ -94,7 +90,6 @@ abstract class TwoPaneFragment : Fragment() {
         super.onConfigurationChanged(newConfig)
         updateTwoPaneVisibilities()
         updateDrawerLockMode()
-        updateStatusBarColor()
     }
 
     private fun observeCurrentFolder() = with(twoPaneViewModel) {
@@ -122,12 +117,7 @@ abstract class TwoPaneFragment : Fragment() {
         twoPaneViewModel.currentThreadUid.observe(viewLifecycleOwner) { threadUid ->
             updateTwoPaneVisibilities()
             updateDrawerLockMode()
-            val isOpeningThread = threadUid != null
-            if (isOpeningThread) {
-                if (isOnlyRightShown()) setSystemBarsColors(statusBarColor = R.color.backgroundColor, navigationBarColor = null)
-            } else {
-                resetPanes()
-            }
+            if (threadUid == null) resetPanes()
         }
     }
 
@@ -150,7 +140,10 @@ abstract class TwoPaneFragment : Fragment() {
 
     fun handleOnBackPressed() {
         when {
-            isOnlyRightShown() -> twoPaneViewModel.closeThread()
+            isOnlyRightShown() -> {
+                if (SDK_INT >= 29) requireActivity().window.isNavigationBarContrastEnforced = true
+                twoPaneViewModel.closeThread()
+            }
             this is ThreadListFragment -> requireActivity().finish()
             else -> findNavController().popBackStack()
         }
@@ -166,16 +159,12 @@ abstract class TwoPaneFragment : Fragment() {
     }
 
     fun openThreadAndResetItsState(threadUid: String) {
+        if (SDK_INT >= 29) requireActivity().window.isNavigationBarContrastEnforced = false
         getRightPane()?.getFragment<ThreadFragment?>()?.resetThreadState()
         twoPaneViewModel.openThread(threadUid)
     }
 
     private fun resetPanes() {
-
-        if (isOnlyLeftShown()) {
-            setSystemBarsColors(statusBarColor = getStatusBarColor(), navigationBarColor = R.color.backgroundColor)
-        }
-
         threadListAdapter.selectNewThread(newPosition = null, threadUid = null)
 
         childFragmentManager.beginTransaction().replace(R.id.threadHostFragment, ThreadFragment()).commit()
@@ -225,21 +214,6 @@ abstract class TwoPaneFragment : Fragment() {
         }
     }
 
-    private fun updateStatusBarColor() {
-
-        val statusBarColor = if (isOnlyRightShown()) { // Thread (in Phone mode)
-            if (getRightPane()?.getFragment<ThreadFragment?>()?.isScrolledToTheTop() == true) {
-                R.color.toolbarLoweredColor
-            } else {
-                R.color.toolbarElevatedColor
-            }
-        } else { // ThreadList or Search
-            getStatusBarColor()
-        }
-
-        setSystemBarsColors(statusBarColor = statusBarColor, navigationBarColor = null)
-    }
-
     protected fun updateAutoAdvanceNaturalThread(currentPosition: Int, previousPosition: Int) {
         localSettings.autoAdvanceNaturalThread = if (currentPosition > previousPosition) {
             AutoAdvanceMode.FOLLOWING_THREAD