aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-19 07:24:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed content paddings

Browse Source
This commit is contained in:
hiar
2025-08-08 10:33:23 +02:00
committed by Himali Aryal
parent c264fe16d1
commit 8bed6b6a70
2 changed files with 47 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/src/main/java/no/nordicsemi/android/nrftoolbox/view/HomeView.kt
View File

@@ -2,6 +2,7 @@ package no.nordicsemi.android.nrftoolbox.view
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
@@ -30,8 +31,6 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import no.nordicsemi.android.common.analytics.view.AnalyticsPermissionButton
import no.nordicsemi.android.common.ui.view.NordicAppBar
import no.nordicsemi.android.nrftoolbox.R
import no.nordicsemi.android.nrftoolbox.viewmodel.HomeViewModel
import no.nordicsemi.android.nrftoolbox.viewmodel.UiEvent
@@ -45,20 +44,13 @@ internal fun HomeView() {
val onEvent: (UiEvent) -> Unit = { viewModel.onClickEvent(it) }
Scaffold(
topBar = { TitleAppBar(stringResource(id = R.string.app_name)) },
contentWindowInsets = WindowInsets.displayCutout
.only(WindowInsetsSides.Horizontal),
topBar = {
NordicAppBar(
title = { Text(stringResource(id = R.string.app_name)) },
showBackButton = false,
) {
AnalyticsPermissionButton()
}
},
floatingActionButton = {
ExtendedFloatingActionButton(
onClick = { onEvent(UiEvent.OnConnectDeviceClick) },
modifier = Modifier.padding(top = 8.dp, bottom = 16.dp, end = 8.dp, start = 8.dp),
modifier = Modifier.padding(8.dp)
) {
Row(
verticalAlignment = Alignment.CenterVertically,
@@ -76,8 +68,9 @@ internal fun HomeView() {
LazyColumn(
modifier = Modifier
.fillMaxSize()
.padding(16.dp)
.padding(paddingValues),
.padding(paddingValues)
.padding(horizontal = 16.dp),
contentPadding = PaddingValues(bottom = 16.dp),
verticalArrangement = Arrangement.spacedBy(16.dp),
) {
item {
@@ -86,7 +79,7 @@ internal fun HomeView() {
text = stringResource(R.string.connected_devices),
modifier = Modifier
.alpha(0.5f)
.padding(start = 16.dp),
.padding(start = 16.dp, end = 16.dp, top = 16.dp),
)
if (state.connectedDevices.isNotEmpty()) {
Column(

40
app/src/main/java/no/nordicsemi/android/nrftoolbox/view/TitleAppBar.kt Normal file
View File

@@ -0,0 +1,40 @@
package no.nordicsemi.android.nrftoolbox.view
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.displayCutout
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.statusBars
import androidx.compose.foundation.layout.union
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.colorResource
import no.nordicsemi.android.common.analytics.view.AnalyticsPermissionButton
import no.nordicsemi.android.nrftoolbox.R
@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun TitleAppBar(text: String) {
TopAppBar(
title = { Text(text, maxLines = 2) },
colors = TopAppBarDefaults.topAppBarColors(
scrolledContainerColor = MaterialTheme.colorScheme.primary,
containerColor = colorResource(id = R.color.appBarColor),
titleContentColor = MaterialTheme.colorScheme.onPrimary,
actionIconContentColor = MaterialTheme.colorScheme.onPrimary,
navigationIconContentColor = MaterialTheme.colorScheme.onPrimary,
),
windowInsets = WindowInsets.displayCutout
.union(WindowInsets.statusBars)
.union(WindowInsets.navigationBars)
.only(WindowInsetsSides.Horizontal + WindowInsetsSides.Top),
actions = {
AnalyticsPermissionButton()
}
)
}