From 5a47f5cb6fe039440a87b36cdafd6e7bc694f25f Mon Sep 17 00:00:00 2001 From: Sylwester Zielinski Date: Wed, 25 Jan 2023 14:03:55 +0100 Subject: [PATCH] Fix paddings on screens --- .../android/bps/view/BPSContentView.kt | 3 +-- .../nordicsemi/android/bps/view/BPSScreen.kt | 20 ++++++++++++++----- .../android/cgms/view/CGMContentView.kt | 4 +--- .../nordicsemi/android/cgms/view/CGMScreen.kt | 20 ++++++++++++++----- .../gls/main/viewmodel/GLSViewModel.kt | 1 + .../android/hrs/view/HRSContentView.kt | 3 +-- .../nordicsemi/android/hrs/view/HRSScreen.kt | 20 ++++++++++++++----- .../android/hts/view/HTSContentView.kt | 4 +--- .../nordicsemi/android/hts/view/HTSScreen.kt | 20 ++++++++++++++----- .../nordicsemi/android/prx/view/PRXScreen.kt | 20 ++++++++++++++----- .../android/rscs/view/RSCSScreen.kt | 20 ++++++++++++++----- .../android/uart/view/UARTScreen.kt | 20 ++++++++++++++----- 12 files changed, 110 insertions(+), 45 deletions(-) diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSContentView.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSContentView.kt index 658a4bc1..baf2d1c2 100644 --- a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSContentView.kt +++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSContentView.kt @@ -48,8 +48,7 @@ import no.nordicsemi.android.bps.data.BPSData @Composable internal fun BPSContentView(state: BPSData, onEvent: (BPSViewEvent) -> Unit) { Column( - horizontalAlignment = Alignment.CenterHorizontally, - modifier = Modifier.padding(16.dp) + horizontalAlignment = Alignment.CenterHorizontally ) { BPSSensorsReadingView(state = state) diff --git a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt index 6e84bf96..939d6322 100644 --- a/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt +++ b/profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt @@ -32,12 +32,16 @@ package no.nordicsemi.android.bps.view import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.bps.R import no.nordicsemi.android.bps.viewmodel.BPSViewModel @@ -57,17 +61,23 @@ import no.nordicsemi.android.ui.view.BackIconAppBar import no.nordicsemi.android.ui.view.LoggerIconAppBar import no.nordicsemi.android.ui.view.NavigateUpButton +@OptIn(ExperimentalMaterial3Api::class) @Composable fun BPSScreen() { val viewModel: BPSViewModel = hiltViewModel() val state = viewModel.state.collectAsState().value - Column { - val navigateUp = { viewModel.onEvent(DisconnectEvent) } + val navigateUp = { viewModel.onEvent(DisconnectEvent) } - AppBar(state = state, navigateUp = navigateUp, viewModel = viewModel) - - Column(modifier = Modifier.verticalScroll(rememberScrollState())) { + Scaffold( + topBar = { AppBar(state = state, navigateUp = navigateUp, viewModel = viewModel) } + ) { + Column( + modifier = Modifier + .padding(it) + .padding(16.dp) + .verticalScroll(rememberScrollState()) + ) { when (state) { NoDeviceState -> DeviceConnectingView() is WorkingState -> when (state.result) { diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt index 472e1ac3..7e949d51 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt @@ -64,9 +64,7 @@ import no.nordicsemi.android.ui.view.SectionTitle @Composable internal fun CGMContentView(state: CGMData, onEvent: (CGMViewEvent) -> Unit) { Column( - modifier = Modifier - .fillMaxSize() - .padding(16.dp), + modifier = Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally ) { SettingsView(state, onEvent) diff --git a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt index 25c408e0..384295e0 100644 --- a/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt +++ b/profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt @@ -32,12 +32,16 @@ package no.nordicsemi.android.cgms.view import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.cgms.R import no.nordicsemi.android.cgms.viewmodel.CGMViewModel @@ -57,17 +61,23 @@ import no.nordicsemi.android.ui.view.BackIconAppBar import no.nordicsemi.android.ui.view.LoggerIconAppBar import no.nordicsemi.android.ui.view.NavigateUpButton +@OptIn(ExperimentalMaterial3Api::class) @Composable fun CGMScreen() { val viewModel: CGMViewModel = hiltViewModel() val state = viewModel.state.collectAsState().value - Column { - val navigateUp = { viewModel.onEvent(NavigateUp) } + val navigateUp = { viewModel.onEvent(NavigateUp) } - AppBar(state, navigateUp, viewModel) - - Column(modifier = Modifier.verticalScroll(rememberScrollState())) { + Scaffold( + topBar = { AppBar(state = state, navigateUp = navigateUp, viewModel = viewModel) } + ) { + Column( + modifier = Modifier + .padding(it) + .padding(16.dp) + .verticalScroll(rememberScrollState()) + ) { when (state) { NoDeviceState -> DeviceConnectingView() is WorkingState -> when (state.result) { diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt index 9471d28a..a789d575 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt +++ b/profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt @@ -32,6 +32,7 @@ package no.nordicsemi.android.gls.main.viewmodel import android.os.ParcelUuid +import android.util.Log import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt index c4409428..4cd10842 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt @@ -55,8 +55,7 @@ import no.nordicsemi.android.ui.view.SectionTitle @Composable internal fun HRSContentView(state: HRSData, zoomIn: Boolean, onEvent: (HRSScreenViewEvent) -> Unit) { Column( - horizontalAlignment = Alignment.CenterHorizontally, - modifier = Modifier.padding(16.dp) + horizontalAlignment = Alignment.CenterHorizontally ) { ScreenSection { diff --git a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt index 1477d1de..c615f37a 100644 --- a/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt +++ b/profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt @@ -32,12 +32,16 @@ package no.nordicsemi.android.hrs.view import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.common.ui.scanner.view.DeviceConnectingView import no.nordicsemi.android.common.ui.scanner.view.DeviceDisconnectedView @@ -57,17 +61,23 @@ import no.nordicsemi.android.ui.view.BackIconAppBar import no.nordicsemi.android.ui.view.LoggerIconAppBar import no.nordicsemi.android.ui.view.NavigateUpButton +@OptIn(ExperimentalMaterial3Api::class) @Composable fun HRSScreen() { val viewModel: HRSViewModel = hiltViewModel() val state = viewModel.state.collectAsState().value - Column { - val navigateUp = { viewModel.onEvent(NavigateUpEvent) } + val navigateUp = { viewModel.onEvent(NavigateUpEvent) } - AppBar(state, navigateUp, viewModel) - - Column(modifier = Modifier.verticalScroll(rememberScrollState())) { + Scaffold( + topBar = { AppBar(state, navigateUp, viewModel) } + ) { + Column( + modifier = Modifier + .padding(it) + .padding(16.dp) + .verticalScroll(rememberScrollState()) + ) { when (state) { NoDeviceState -> DeviceConnectingView() is WorkingState -> when (state.result) { diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt index ac13df05..8858ab9d 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt @@ -55,9 +55,7 @@ import no.nordicsemi.android.ui.view.SectionTitle @Composable internal fun HTSContentView(state: HTSData, temperatureUnit: TemperatureUnit, onEvent: (HTSScreenViewEvent) -> Unit) { Column( - modifier = Modifier - .fillMaxSize() - .padding(16.dp), + modifier = Modifier.fillMaxSize(), horizontalAlignment = Alignment.CenterHorizontally ) { ScreenSection { diff --git a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt index fa813d44..60f506cf 100644 --- a/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt +++ b/profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt @@ -32,12 +32,16 @@ package no.nordicsemi.android.hts.view import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.common.ui.scanner.view.DeviceConnectingView import no.nordicsemi.android.common.ui.scanner.view.DeviceDisconnectedView @@ -57,17 +61,23 @@ import no.nordicsemi.android.ui.view.BackIconAppBar import no.nordicsemi.android.ui.view.LoggerIconAppBar import no.nordicsemi.android.ui.view.NavigateUpButton +@OptIn(ExperimentalMaterial3Api::class) @Composable fun HTSScreen() { val viewModel: HTSViewModel = hiltViewModel() val state = viewModel.state.collectAsState().value - Column { - val navigateUp = { viewModel.onEvent(NavigateUp) } + val navigateUp = { viewModel.onEvent(NavigateUp) } - AppBar(state, navigateUp, viewModel) - - Column(modifier = Modifier.verticalScroll(rememberScrollState())) { + Scaffold( + topBar = { AppBar(state, navigateUp, viewModel) } + ) { + Column( + modifier = Modifier + .padding(it) + .padding(16.dp) + .verticalScroll(rememberScrollState()) + ) { when (state.htsManagerState) { NoDeviceState -> DeviceConnectingView() is WorkingState -> when (state.htsManagerState.result) { diff --git a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt index 7ff0a1a3..933db8a7 100644 --- a/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt +++ b/profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt @@ -32,13 +32,17 @@ package no.nordicsemi.android.prx.view import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.common.ui.scanner.view.DeviceConnectingView import no.nordicsemi.android.common.ui.scanner.view.DeviceDisconnectedView @@ -58,17 +62,23 @@ import no.nordicsemi.android.ui.view.BackIconAppBar import no.nordicsemi.android.ui.view.LoggerIconAppBar import no.nordicsemi.android.ui.view.NavigateUpButton +@OptIn(ExperimentalMaterial3Api::class) @Composable fun PRXScreen() { val viewModel: PRXViewModel = hiltViewModel() val state = viewModel.state.collectAsState().value - Column(horizontalAlignment = Alignment.CenterHorizontally) { - val navigateUp = { viewModel.onEvent(NavigateUpEvent) } + val navigateUp = { viewModel.onEvent(NavigateUpEvent) } - AppBar(state, navigateUp, viewModel) - - Column(modifier = Modifier.verticalScroll(rememberScrollState())) { + Scaffold( + topBar = { AppBar(state, navigateUp, viewModel) } + ) { + Column( + modifier = Modifier + .padding(it) + .padding(16.dp) + .verticalScroll(rememberScrollState()) + ) { when (state) { NoDeviceState -> DeviceConnectingView() is WorkingState -> when (state.result) { diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt index 42e23235..9825bf92 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt +++ b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt @@ -32,12 +32,16 @@ package no.nordicsemi.android.rscs.view import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.common.ui.scanner.view.DeviceConnectingView import no.nordicsemi.android.common.ui.scanner.view.DeviceDisconnectedView @@ -57,17 +61,23 @@ import no.nordicsemi.android.ui.view.BackIconAppBar import no.nordicsemi.android.ui.view.LoggerIconAppBar import no.nordicsemi.android.ui.view.NavigateUpButton +@OptIn(ExperimentalMaterial3Api::class) @Composable fun RSCSScreen() { val viewModel: RSCSViewModel = hiltViewModel() val state = viewModel.state.collectAsState().value - Column { - val navigateUp = { viewModel.onEvent(NavigateUpEvent) } + val navigateUp = { viewModel.onEvent(NavigateUpEvent) } - AppBar(state, navigateUp, viewModel) - - Column(modifier = Modifier.verticalScroll(rememberScrollState())) { + Scaffold( + topBar = { AppBar(state, navigateUp, viewModel) } + ) { + Column( + modifier = Modifier + .padding(it) + .padding(16.dp) + .verticalScroll(rememberScrollState()) + ) { when (state) { NoDeviceState -> DeviceConnectingView() is WorkingState -> when (state.result) { diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt index 05242a62..088d2a9d 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt +++ b/profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt @@ -32,12 +32,16 @@ package no.nordicsemi.android.uart.view import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold import androidx.compose.runtime.Composable import androidx.compose.runtime.collectAsState import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource +import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.common.theme.view.PagerView import no.nordicsemi.android.common.theme.view.PagerViewEntity @@ -61,17 +65,23 @@ import no.nordicsemi.android.ui.view.BackIconAppBar import no.nordicsemi.android.ui.view.LoggerIconAppBar import no.nordicsemi.android.ui.view.NavigateUpButton +@OptIn(ExperimentalMaterial3Api::class) @Composable fun UARTScreen() { val viewModel: UARTViewModel = hiltViewModel() val state = viewModel.state.collectAsState().value - Column { - val navigateUp = { viewModel.onEvent(NavigateUp) } + val navigateUp = { viewModel.onEvent(NavigateUp) } - AppBar(state = state, navigateUp = navigateUp) { viewModel.onEvent(it) } - - Column(modifier = Modifier.verticalScroll(rememberScrollState())) { + Scaffold( + topBar = { AppBar(state, navigateUp) { viewModel.onEvent(it) } } + ) { + Column( + modifier = Modifier + .padding(it) + .padding(16.dp) + .verticalScroll(rememberScrollState()) + ) { when (state.uartManagerState) { NoDeviceState -> DeviceConnectingView() is WorkingState -> when (state.uartManagerState.result) {