Merge pull request #1706 from Infomaniak/remove-slidingPaneLayout

Fix Messages blink by removing SlidingPaneLayout

Author: KevinBoulongne

app/build.gradle

@@ -90,7 +90,6 @@ dependencies {
     implementation libs.lottie
     implementation libs.dragdropswipe.recyclerview
     implementation libs.dotsindicator
-    implementation libs.slidingpanelayout
 
     implementation libs.flexbox
     implementation libs.lifecycle.process

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

@@ -24,12 +24,14 @@ 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
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.view.isGone
 import androidx.core.view.isVisible
+import androidx.fragment.app.FragmentContainerView
 import androidx.fragment.app.viewModels
 import androidx.lifecycle.distinctUntilChanged
 import androidx.navigation.fragment.findNavController
@@ -63,7 +65,6 @@ import com.infomaniak.mail.data.models.thread.Thread.ThreadFilter
 import com.infomaniak.mail.databinding.FragmentThreadListBinding
 import com.infomaniak.mail.ui.MainActivity
 import com.infomaniak.mail.ui.alertDialogs.DescriptionAlertDialog
-import com.infomaniak.mail.ui.main.NoAnimSlidingPaneLayout
 import com.infomaniak.mail.ui.main.SnackbarManager
 import com.infomaniak.mail.ui.main.settings.swipe.SwipeActionsSettingsFragment
 import com.infomaniak.mail.ui.main.thread.ThreadFragment
@@ -94,8 +95,6 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
     private val navigationArgs: ThreadListFragmentArgs by navArgs()
     private val threadListViewModel: ThreadListViewModel by viewModels()
 
-    override val slidingPaneLayout: NoAnimSlidingPaneLayout get() = binding.threadListSlidingPaneLayout
-
     private val threadListMultiSelection by lazy { ThreadListMultiSelection() }
 
     private var lastUpdatedDate: Date? = null
@@ -169,6 +168,13 @@ class ThreadListFragment : TwoPaneFragment(), SwipeRefreshLayout.OnRefreshListen
         observeUpdateInstall()
     }.getOrDefault(Unit)
 
+    @ColorRes
+    override fun getStatusBarColor(): Int = R.color.backgroundHeaderColor
+
+    override fun getLeftPane(): View? = _binding?.threadsConstraintLayout
+
+    override fun getRightPane(): FragmentContainerView? = _binding?.threadHostFragment
+
     override fun getAnchor(): View? {
         return if (isOnlyRightShown()) {
             _binding?.threadHostFragment?.getFragment<ThreadFragment?>()?.getAnchor()

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

@@ -20,10 +20,14 @@ package com.infomaniak.mail.ui.main.folder
 import android.content.res.Configuration
 import android.os.Bundle
 import android.view.View
+import androidx.annotation.ColorRes
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.view.isGone
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentContainerView
 import androidx.fragment.app.activityViewModels
 import androidx.navigation.fragment.findNavController
-import androidx.slidingpanelayout.widget.SlidingPaneLayout
 import com.infomaniak.lib.core.utils.getBackNavigationResult
 import com.infomaniak.lib.core.utils.safeNavigate
 import com.infomaniak.mail.MatomoMail.OPEN_FROM_DRAFT_NAME
@@ -33,76 +37,46 @@ import com.infomaniak.mail.data.cache.mailboxContent.FolderController
 import com.infomaniak.mail.data.models.thread.Thread
 import com.infomaniak.mail.ui.MainActivity
 import com.infomaniak.mail.ui.MainViewModel
-import com.infomaniak.mail.ui.main.NoAnimSlidingPaneLayout
 import com.infomaniak.mail.ui.main.search.SearchFragment
 import com.infomaniak.mail.ui.main.thread.ThreadFragment
-import com.infomaniak.mail.utils.UiUtils.FULLY_SLID
-import com.infomaniak.mail.utils.UiUtils.progressivelyColorSystemBars
-import com.infomaniak.mail.utils.extensions.AttachmentExtensions
-import com.infomaniak.mail.utils.extensions.safeNavigateToNewMessageActivity
-import com.infomaniak.mail.utils.extensions.setSystemBarsColors
+import com.infomaniak.mail.utils.extensions.*
 import javax.inject.Inject
 
 abstract class TwoPaneFragment : Fragment() {
 
     val mainViewModel: MainViewModel by activityViewModels()
     protected val twoPaneViewModel: TwoPaneViewModel by activityViewModels()
 
-    protected abstract val slidingPaneLayout: NoAnimSlidingPaneLayout
-
     // TODO: When we'll update DragDropSwipeRecyclerViewLib, we'll need to make the adapter nullable.
     //  For now it causes a memory leak, because we can't remove the strong reference
     //  between the ThreadList's RecyclerView and its Adapter as it throws an NPE.
     @Inject
     lateinit var threadListAdapter: ThreadListAdapter
 
-    private val leftStatusBarColor: Int by lazy {
-        requireContext().getColor(if (this is ThreadListFragment) R.color.backgroundHeaderColor else R.color.backgroundColor)
-    }
-    private val leftNavigationBarColor: Int by lazy { requireContext().getColor(R.color.backgroundColor) }
-    private val rightStatusBarColor: Int by lazy { requireContext().getColor(R.color.backgroundColor) }
-    private val rightNavigationBarColor: Int by lazy { requireContext().getColor(R.color.elevatedBackground) }
-
+    @ColorRes
+    abstract fun getStatusBarColor(): Int
+    abstract fun getLeftPane(): View?
+    abstract fun getRightPane(): FragmentContainerView?
     abstract fun getAnchor(): View?
     open fun doAfterFolderChanged() = Unit
 
-    fun isOnlyOneShown() = slidingPaneLayout.isSlideable
-    fun areBothShown() = !isOnlyOneShown()
-    fun isOnlyLeftShown() = isOnlyOneShown() && !slidingPaneLayout.isOpen
-    fun isOnlyRightShown() = isOnlyOneShown() && slidingPaneLayout.isOpen
+    fun isOnlyOneShown(): Boolean = isPhone() || isTabletInPortrait()
+    fun isOnlyLeftShown(): Boolean = isOnlyOneShown() && !twoPaneViewModel.isThreadOpen
+    fun isOnlyRightShown(): Boolean = isOnlyOneShown() && twoPaneViewModel.isThreadOpen
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupSlidingPane()
+        updateTwoPaneVisibilities()
         observeCurrentFolder()
         observeThreadUid()
         observeThreadNavigation()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
         super.onConfigurationChanged(newConfig)
+        updateTwoPaneVisibilities()
         updateDrawerLockMode()
-        ensureThreadIsDisplayed(newConfig.orientation)
-    }
-
-    private fun setupSlidingPane() = with(slidingPaneLayout) {
-
-        lockMode = SlidingPaneLayout.LOCK_MODE_LOCKED
-
-        addPanelSlideListener(object : SlidingPaneLayout.PanelSlideListener {
-            override fun onPanelOpened(panel: View) = Unit
-            override fun onPanelClosed(panel: View) = Unit
-
-            override fun onPanelSlide(panel: View, slideOffset: Float) {
-                requireActivity().window.progressivelyColorSystemBars(
-                    slideOffset = FULLY_SLID - slideOffset,
-                    statusBarColorFrom = leftStatusBarColor,
-                    statusBarColorTo = rightStatusBarColor,
-                    navBarColorFrom = leftNavigationBarColor,
-                    navBarColorTo = rightNavigationBarColor,
-                )
-            }
-        })
+        updateStatusBarColor()
     }
 
     private fun observeCurrentFolder() = with(twoPaneViewModel) {
@@ -128,13 +102,11 @@ abstract class TwoPaneFragment : Fragment() {
 
     private fun observeThreadUid() {
         twoPaneViewModel.currentThreadUid.observe(viewLifecycleOwner) { threadUid ->
+            updateTwoPaneVisibilities()
+            updateDrawerLockMode()
             val isOpeningThread = threadUid != null
             if (isOpeningThread) {
-                val hasOpened = slidingPaneLayout.openPaneNoAnimation()
-                if (hasOpened) {
-                    updateDrawerLockMode()
-                    setSystemBarsColors(statusBarColor = R.color.backgroundColor, navigationBarColor = null)
-                }
+                if (isOnlyRightShown()) setSystemBarsColors(statusBarColor = R.color.backgroundColor, navigationBarColor = null)
             } else {
                 resetPanes()
             }
@@ -172,33 +144,72 @@ abstract class TwoPaneFragment : Fragment() {
 
     private fun resetPanes() {
 
-        val hasClosed = slidingPaneLayout.closePaneNoAnimation()
-        updateDrawerLockMode()
-
-        if (hasClosed) {
-            setSystemBarsColors(
-                statusBarColor = if (this@TwoPaneFragment is ThreadListFragment) R.color.backgroundHeaderColor else null,
-                navigationBarColor = R.color.backgroundColor,
-            )
+        if (isOnlyLeftShown()) {
+            setSystemBarsColors(statusBarColor = getStatusBarColor(), navigationBarColor = R.color.backgroundColor)
         }
 
         threadListAdapter.selectNewThread(newPosition = null, threadUid = null)
 
         childFragmentManager.beginTransaction().replace(R.id.threadHostFragment, ThreadFragment()).commit()
     }
 
+    private fun updateTwoPaneVisibilities() {
+
+        val (leftWidth, rightWidth) = computeTwoPaneWidths(
+            widthPixels = requireActivity().application.resources.displayMetrics.widthPixels,
+            isThreadOpen = twoPaneViewModel.isThreadOpen,
+        )
+
+        getLeftPane()?.let { leftPane ->
+            if (leftWidth == 0) {
+                leftPane.isGone = true
+            } else {
+                if (leftPane.width != leftWidth) leftPane.layoutParams?.width = leftWidth
+                leftPane.isVisible = true
+            }
+        }
+
+        getRightPane()?.let { rightPane ->
+            if (rightWidth == 0) {
+                rightPane.isGone = true
+            } else {
+                if (rightPane.width != rightWidth) rightPane.layoutParams?.width = rightWidth
+                rightPane.isVisible = true
+            }
+        }
+    }
+
+    private fun computeTwoPaneWidths(widthPixels: Int, isThreadOpen: Boolean): Pair<Int, Int> = with(twoPaneViewModel) {
+
+        val leftPaneWidthRatio = ResourcesCompat.getFloat(resources, R.dimen.leftPaneWidthRatio)
+        val rightPaneWidthRatio = ResourcesCompat.getFloat(resources, R.dimen.rightPaneWidthRatio)
+
+        return if (isTabletInLandscape()) {
+            (leftPaneWidthRatio * widthPixels).toInt() to (rightPaneWidthRatio * widthPixels).toInt()
+        } else {
+            if (isThreadOpen) 0 to widthPixels else widthPixels to 0
+        }
+    }
+
     // TODO: When we'll add the feature of swiping between Threads, we'll need to check if this function is still needed.
     private fun updateDrawerLockMode() {
         if (this is ThreadListFragment) {
-            (requireActivity() as MainActivity).setDrawerLockMode(
-                isLocked = twoPaneViewModel.isInThreadInPhoneMode(requireContext()),
-            )
+            (requireActivity() as MainActivity).setDrawerLockMode(isLocked = isOnlyRightShown())
         }
     }
 
-    private fun ensureThreadIsDisplayed(orientation: Int) {
-        if (orientation == Configuration.ORIENTATION_PORTRAIT && twoPaneViewModel.isInThreadInPhoneMode(requireContext())) {
-            slidingPaneLayout.openPaneNoAnimation()
+    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)
     }
 }

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

@@ -17,7 +17,6 @@
  */
 package com.infomaniak.mail.ui.main.folder
 
-import android.content.Context
 import android.net.Uri
 import android.os.Bundle
 import androidx.annotation.IdRes
@@ -32,7 +31,6 @@ 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.extensions.canDisplayOnlyOnePane
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -94,8 +92,6 @@ class TwoPaneViewModel @Inject constructor(
         )
     }
 
-    fun isInThreadInPhoneMode(context: Context): Boolean = isThreadOpen && context.canDisplayOnlyOnePane()
-
     data class NavData(
         @IdRes val resId: Int,
         val args: Bundle,