Add canDisplayOnlyOnePane()

Author: KevinBoulongne

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

@@ -39,7 +39,6 @@ import com.infomaniak.mail.ui.main.thread.ThreadFragment
 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.canDisplayBothPanes
 import com.infomaniak.mail.utils.safeNavigateToNewMessageActivity
 import com.infomaniak.mail.utils.setSystemBarsColors
 import javax.inject.Inject
@@ -188,7 +187,9 @@ abstract class TwoPaneFragment : Fragment() {
     // 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.isThreadOpen && !canDisplayBothPanes())
+            (requireActivity() as MainActivity).setDrawerLockMode(
+                isLocked = twoPaneViewModel.isInThreadInPhoneMode(requireContext()),
+            )
         }
     }
 }

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

@@ -32,7 +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 com.infomaniak.mail.utils.canDisplayOnlyOnePane
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 
@@ -94,7 +94,7 @@ class TwoPaneViewModel @Inject constructor(
         )
     }
 
-    fun isInThreadInPhoneMode(context: Context): Boolean = isThreadOpen && !context.canDisplayBothPanes()
+    fun isInThreadInPhoneMode(context: Context): Boolean = isThreadOpen && context.canDisplayOnlyOnePane()
 
     data class NavData(
         @IdRes val resId: Int,

app/src/main/java/com/infomaniak/mail/utils/Extensions.kt

@@ -159,8 +159,10 @@ fun Date.isLastWeek(): Boolean {
 //region UI
 fun Context.isInPortrait(): Boolean = resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
 
+private fun Context.canDisplayBothPanes(): Boolean = resources.getBoolean(R.bool.canDisplayBothPanes)
 fun Fragment.canDisplayBothPanes(): Boolean = requireContext().canDisplayBothPanes()
-fun Context.canDisplayBothPanes(): Boolean = resources.getBoolean(R.bool.canDisplayBothPanes)
+fun Context.canDisplayOnlyOnePane(): Boolean = !canDisplayBothPanes()
+fun Fragment.canDisplayOnlyOnePane(): Boolean = requireContext().canDisplayOnlyOnePane()
 
 fun View.toggleChevron(
     isCollapsed: Boolean,