mirror of
https://github.com/signalapp/Signal-Android.git
synced 2025-12-26 05:58:09 +00:00
Fix navigation bar and display cutout overlap on compact-width screens in landscape.
This commit is contained in:
committed by
Michelle Tang
parent
076b78759e
commit
7048476399
@@ -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(
|
||||
|
||||
Reference in New Issue
Block a user