From bd2a7851ff75d21e9fabbdf5f18bb5aeeefd6d36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Fri, 4 Feb 2022 09:55:19 +0100 Subject: [PATCH] Add version name to home screen --- .../nordicsemi/android/nrftoolbox/FeatureButton.kt | 14 +++++++++++--- .../no/nordicsemi/android/nrftoolbox/HomeView.kt | 14 ++++++++++++-- app/src/main/res/values/strings.xml | 5 ++++- 3 files changed, 27 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt index 2a4572d0..989d598d 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/FeatureButton.kt @@ -32,7 +32,7 @@ fun FeatureButton( Row( modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.Center + horizontalArrangement = Arrangement.SpaceBetween ) { Image( painter = painterResource(iconId), @@ -50,8 +50,16 @@ fun FeatureButton( Text( text = stringResource(id = name), - style = MaterialTheme.typography.titleMedium, - modifier = Modifier.fillMaxWidth(), + style = MaterialTheme.typography.bodyLarge, + modifier = Modifier.weight(1f), + textAlign = TextAlign.Center + ) + + Spacer(modifier = Modifier.size(16.dp)) + + Text( + text = stringResource(id = nameCode), + style = MaterialTheme.typography.headlineSmall, textAlign = TextAlign.Center ) } diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeView.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeView.kt index f765b13f..cd32f050 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeView.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeView.kt @@ -9,6 +9,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import no.nordicsemi.android.theme.view.TitleAppBar @@ -33,7 +34,7 @@ fun HomeScreen() { Spacer(modifier = Modifier.height(16.dp)) Text( - text = "Bluetooth services", + text = stringResource(id = R.string.bluetooth_services), style = MaterialTheme.typography.titleLarge, modifier = Modifier.fillMaxWidth(), ) @@ -89,7 +90,7 @@ fun HomeScreen() { Spacer(modifier = Modifier.height(16.dp)) Text( - text = "Utils services", + text = stringResource(id = R.string.utils_services), style = MaterialTheme.typography.titleLarge, modifier = Modifier.fillMaxWidth(), ) @@ -108,6 +109,15 @@ fun HomeScreen() { } Spacer(modifier = Modifier.height(16.dp)) + + Text( + text = BuildConfig.VERSION_NAME, + style = MaterialTheme.typography.labelSmall, + modifier = Modifier.fillMaxWidth(), + textAlign = TextAlign.Center + ) + + Spacer(modifier = Modifier.height(16.dp)) } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 09e9d06c..3b55da1f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,5 +18,8 @@ UART Serial port over BLE DFU - DFU is now available in separate application. + Available in separate application. + + Bluetooth services + Utils services