From 7048476399a8784df4c2eb734bad3033cc6f8389 Mon Sep 17 00:00:00 2001
From: jeffrey-signal <jeffrey@signal.org>
Date: Wed, 5 Nov 2025 15:09:54 -0500
Subject: [PATCH] Fix navigation bar and display cutout overlap on
 compact-width screens in landscape.

---
 .../thoughtcrime/securesms/MainActivity.kt    | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
index 632b6c12ff..0269bf81ba 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt
@@ -10,6 +10,7 @@ import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.res.Configuration
 import android.os.Bundle
 import android.view.MotionEvent
 import android.view.View
@@ -53,6 +54,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
@@ -719,12 +721,20 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
         SignalTheme.colors.colorSurface1
       }
 
-      val modifier = if (windowSizeClass.isSplitPane()) {
-        Modifier
-          .systemBarsPadding()
-          .displayCutoutPadding()
-      } else {
-        Modifier
+      val modifier = when {
+        windowSizeClass.isSplitPane() -> {
+          Modifier
+            .systemBarsPadding()
+            .displayCutoutPadding()
+        }
+
+        LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE -> {
+          Modifier
+            .navigationBarsPadding()
+            .displayCutoutPadding()
+        }
+
+        else -> Modifier
       }
 
       BoxWithConstraints(