aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-02-09 00:34:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix paddings on screens

Browse Source
This commit is contained in:
Sylwester Zielinski
2023-01-25 14:03:55 +01:00
parent f5153a1456
commit 5a47f5cb6f
12 changed files with 110 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSContentView.kt
View File

@@ -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)

20
profile_bps/src/main/java/no/nordicsemi/android/bps/view/BPSScreen.kt
View File

@@ -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) {

4
profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMContentView.kt
View File

@@ -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)

20
profile_cgms/src/main/java/no/nordicsemi/android/cgms/view/CGMScreen.kt
View File

@@ -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) {

1
profile_gls/src/main/java/no/nordicsemi/android/gls/main/viewmodel/GLSViewModel.kt
View File

@@ -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

3
profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSContentView.kt
View File

@@ -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 {

20
profile_hrs/src/main/java/no/nordicsemi/android/hrs/view/HRSScreen.kt
View File

@@ -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) {

4
profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSContentView.kt
View File

@@ -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 {

20
profile_hts/src/main/java/no/nordicsemi/android/hts/view/HTSScreen.kt
View File

@@ -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) {

20
profile_prx/src/main/java/no/nordicsemi/android/prx/view/PRXScreen.kt
View File

@@ -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) {

20
profile_rscs/src/main/java/no/nordicsemi/android/rscs/view/RSCSScreen.kt
View File

@@ -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) {

20
profile_uart/src/main/java/no/nordicsemi/android/uart/view/UARTScreen.kt
View File

@@ -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) {