Skip to content

Commit 7048476

Browse files
jeffrey-signalmtang-signal
authored andcommitted
Fix navigation bar and display cutout overlap on compact-width screens in landscape.
1 parent 076b787 commit 7048476

File tree

1 file changed

+16
-6
lines changed

1 file changed

+16
-6
lines changed

app/src/main/java/org/thoughtcrime/securesms/MainActivity.kt

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import android.annotation.SuppressLint
1010
import android.app.Activity
1111
import android.content.Context
1212
import android.content.Intent
13+
import android.content.res.Configuration
1314
import android.os.Bundle
1415
import android.view.MotionEvent
1516
import android.view.View
@@ -53,6 +54,7 @@ import androidx.compose.runtime.saveable.rememberSaveable
5354
import androidx.compose.ui.Alignment
5455
import androidx.compose.ui.Modifier
5556
import androidx.compose.ui.draw.clip
57+
import androidx.compose.ui.platform.LocalConfiguration
5658
import androidx.compose.ui.platform.LocalFocusManager
5759
import androidx.compose.ui.unit.Dp
5860
import androidx.compose.ui.unit.dp
@@ -719,12 +721,20 @@ class MainActivity : PassphraseRequiredActivity(), VoiceNoteMediaControllerOwner
719721
SignalTheme.colors.colorSurface1
720722
}
721723

722-
val modifier = if (windowSizeClass.isSplitPane()) {
723-
Modifier
724-
.systemBarsPadding()
725-
.displayCutoutPadding()
726-
} else {
727-
Modifier
724+
val modifier = when {
725+
windowSizeClass.isSplitPane() -> {
726+
Modifier
727+
.systemBarsPadding()
728+
.displayCutoutPadding()
729+
}
730+
731+
LocalConfiguration.current.orientation == Configuration.ORIENTATION_LANDSCAPE -> {
732+
Modifier
733+
.navigationBarsPadding()
734+
.displayCutoutPadding()
735+
}
736+
737+
else -> Modifier
728738
}
729739

730740
BoxWithConstraints(

0 commit comments

Comments
 (0)