mirror of
https://github.com/permissionlesstech/bitchat-android.git
synced 2026-07-25 16:25:22 +00:00
Fix edge-to-edge layout issues (#367)
* Remove redundant setDecorFitsSystemWindows call * Fix edge-to-edge layout issues
This commit is contained in:
@@ -12,7 +12,6 @@ import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.rotate
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
@@ -24,10 +23,9 @@ import com.bitchat.android.R
|
||||
* Screen shown when checking battery optimization status or requesting battery optimization disable
|
||||
*/
|
||||
|
||||
|
||||
|
||||
@Composable
|
||||
fun BatteryOptimizationScreen(
|
||||
modifier: Modifier,
|
||||
status: BatteryOptimizationStatus,
|
||||
onDisableBatteryOptimization: () -> Unit,
|
||||
onRetry: () -> Unit,
|
||||
@@ -37,9 +35,7 @@ fun BatteryOptimizationScreen(
|
||||
val colorScheme = MaterialTheme.colorScheme
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(32.dp),
|
||||
modifier = modifier.padding(32.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
when (status) {
|
||||
|
||||
@@ -3,7 +3,6 @@ package com.bitchat.android.onboarding
|
||||
import androidx.compose.animation.core.*
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.*
|
||||
import androidx.compose.material.icons.outlined.*
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
@@ -21,6 +20,7 @@ import androidx.compose.ui.unit.dp
|
||||
*/
|
||||
@Composable
|
||||
fun BluetoothCheckScreen(
|
||||
modifier: Modifier,
|
||||
status: BluetoothStatus,
|
||||
onEnableBluetooth: () -> Unit,
|
||||
onRetry: () -> Unit,
|
||||
@@ -29,9 +29,7 @@ fun BluetoothCheckScreen(
|
||||
val colorScheme = MaterialTheme.colorScheme
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(32.dp),
|
||||
modifier = modifier.padding(32.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
when (status) {
|
||||
|
||||
@@ -17,7 +17,7 @@ import androidx.compose.ui.unit.dp
|
||||
* Loading screen shown during app initialization after permissions are granted
|
||||
*/
|
||||
@Composable
|
||||
fun InitializingScreen() {
|
||||
fun InitializingScreen(modifier: Modifier) {
|
||||
val colorScheme = MaterialTheme.colorScheme
|
||||
|
||||
// Animated rotation for the loading indicator
|
||||
@@ -50,9 +50,7 @@ fun InitializingScreen() {
|
||||
}
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(32.dp),
|
||||
modifier = modifier.padding(32.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Column(
|
||||
@@ -152,6 +150,7 @@ fun InitializingScreen() {
|
||||
*/
|
||||
@Composable
|
||||
fun InitializationErrorScreen(
|
||||
modifier: Modifier,
|
||||
errorMessage: String,
|
||||
onRetry: () -> Unit,
|
||||
onOpenSettings: () -> Unit
|
||||
@@ -159,9 +158,7 @@ fun InitializationErrorScreen(
|
||||
val colorScheme = MaterialTheme.colorScheme
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(32.dp),
|
||||
modifier = modifier.padding(32.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
Column(
|
||||
|
||||
@@ -21,6 +21,7 @@ import androidx.compose.ui.unit.dp
|
||||
*/
|
||||
@Composable
|
||||
fun LocationCheckScreen(
|
||||
modifier: Modifier,
|
||||
status: LocationStatus,
|
||||
onEnableLocation: () -> Unit,
|
||||
onRetry: () -> Unit,
|
||||
@@ -29,9 +30,7 @@ fun LocationCheckScreen(
|
||||
val colorScheme = MaterialTheme.colorScheme
|
||||
|
||||
Box(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.padding(32.dp),
|
||||
modifier = modifier.padding(32.dp),
|
||||
contentAlignment = Alignment.Center
|
||||
) {
|
||||
when (status) {
|
||||
|
||||
@@ -20,6 +20,7 @@ import androidx.compose.ui.unit.sp
|
||||
*/
|
||||
@Composable
|
||||
fun PermissionExplanationScreen(
|
||||
modifier: Modifier,
|
||||
permissionCategories: List<PermissionCategory>,
|
||||
onContinue: () -> Unit
|
||||
) {
|
||||
@@ -27,7 +28,7 @@ fun PermissionExplanationScreen(
|
||||
val scrollState = rememberScrollState()
|
||||
|
||||
Box(
|
||||
modifier = Modifier.fillMaxSize()
|
||||
modifier = modifier
|
||||
) {
|
||||
// Scrollable content
|
||||
Column(
|
||||
|
||||
Reference in New Issue
Block a user