Merge pull request #154 from anonfaded/fix/battery-screen-truncation

fix(onboarding): make battery screen scrollable
This commit is contained in:
callebtc
2025-07-20 11:07:38 +02:00
committed by GitHub
@@ -2,6 +2,8 @@ package com.bitchat.android.onboarding
import androidx.compose.animation.core.* import androidx.compose.animation.core.*
import androidx.compose.foundation.layout.* import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.* import androidx.compose.material.icons.filled.*
import androidx.compose.material.icons.outlined.* import androidx.compose.material.icons.outlined.*
@@ -76,6 +78,14 @@ private fun BatteryOptimizationEnabledContent(
isLoading: Boolean isLoading: Boolean
) { ) {
Column( Column(
modifier = Modifier.fillMaxSize()
) {
// Scrollable content area
Column(
modifier = Modifier
.weight(1f)
.verticalScroll(rememberScrollState())
.padding(bottom = 16.dp),
verticalArrangement = Arrangement.spacedBy(24.dp), verticalArrangement = Arrangement.spacedBy(24.dp),
horizontalAlignment = Alignment.CenterHorizontally horizontalAlignment = Alignment.CenterHorizontally
) { ) {
@@ -141,8 +151,20 @@ private fun BatteryOptimizationEnabledContent(
} }
} }
Spacer(modifier = Modifier.height(8.dp)) Text(
text = stringResource(R.string.battery_optimization_note),
style = MaterialTheme.typography.bodySmall.copy(
color = colorScheme.onSurfaceVariant
),
textAlign = TextAlign.Center
)
}
// Fixed buttons at the bottom
Column(
verticalArrangement = Arrangement.spacedBy(12.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
Button( Button(
onClick = onDisableBatteryOptimization, onClick = onDisableBatteryOptimization,
modifier = Modifier.fillMaxWidth(), modifier = Modifier.fillMaxWidth(),
@@ -179,14 +201,7 @@ private fun BatteryOptimizationEnabledContent(
Text(stringResource(R.string.battery_optimization_skip)) Text(stringResource(R.string.battery_optimization_skip))
} }
} }
}
Text(
text = stringResource(R.string.battery_optimization_note),
style = MaterialTheme.typography.bodySmall.copy(
color = colorScheme.onSurfaceVariant
),
textAlign = TextAlign.Center
)
} }
} }