Toolbox changes.

This commit is contained in:
Sylwester Zieliński
2022-01-26 12:29:21 +01:00
parent e3010c80e8
commit d3fca87c45
19 changed files with 138 additions and 121 deletions

View File

@@ -4,12 +4,7 @@ import androidx.annotation.DrawableRes
import androidx.annotation.StringRes
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
@@ -37,14 +32,18 @@ fun FeatureButton(
Column(
modifier = Modifier
.fillMaxWidth()
.height(150.dp)
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally
.height(160.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Text(
text = stringResource(id = nameCode),
style = MaterialTheme.typography.labelMedium
)
Box( modifier = Modifier.weight(1f)) {
Text(
text = stringResource(id = nameCode),
style = MaterialTheme.typography.labelMedium,
modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter),
textAlign = TextAlign.Center
)
}
Spacer(modifier = Modifier.height(8.dp))
@@ -62,11 +61,14 @@ fun FeatureButton(
Spacer(modifier = Modifier.height(8.dp))
Text(
text = stringResource(id = name),
style = MaterialTheme.typography.bodyMedium,
textAlign = TextAlign.Center
)
Box( modifier = Modifier.weight(1f)) {
Text(
text = stringResource(id = name),
style = MaterialTheme.typography.bodyMedium,
modifier = Modifier.fillMaxWidth().align(Alignment.TopCenter),
textAlign = TextAlign.Center
)
}
}
}
}

View File

@@ -1,21 +1,14 @@
package no.nordicsemi.android.nrftoolbox
import android.app.Activity
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.LocalUriHandler
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
@@ -109,8 +102,9 @@ fun HomeScreen() {
Spacer(modifier = Modifier.height(16.dp))
val uriHandler = LocalUriHandler.current
FeatureButton(R.drawable.ic_dfu, R.string.dfu_module, R.string.dfu_module_full) {
uriHandler.openUri("https://github.com/NordicSemiconductor/Android-nRF-Toolbox")
}
Spacer(modifier = Modifier.height(16.dp))