aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-06 08:14:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add first working example of CGM service in new approach

Browse Source
This commit is contained in:
Sylwester Zieliński
2022-02-11 11:02:06 +01:00
parent d12409cffd
commit 8d21c591ee
20 changed files with 267 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/DeviceConnectingView.kt
View File

@@ -9,10 +9,12 @@ import androidx.compose.foundation.layout.size
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.HourglassTop
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
@@ -22,11 +24,12 @@ import no.nordicsemi.android.theme.R
import no.nordicsemi.android.theme.view.ScreenSection
@Composable
fun DeviceConnectingView() {
fun DeviceConnectingView(navigateUp: () -> Unit) {
Column(
modifier = Modifier
.fillMaxSize()
.padding(16.dp)
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
ScreenSection {
Icon(
@@ -64,11 +67,17 @@ fun DeviceConnectingView() {
style = MaterialTheme.typography.titleLarge
)
}
Spacer(modifier = Modifier.size(16.dp))
Button(onClick = { navigateUp() }) {
Text(text = stringResource(id = R.string.disconnect))
}
}
}
@Preview
@Composable
fun DeviceConnectingView_Preview() {
DeviceConnectingView()
DeviceConnectingView { }
}

15
lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/DeviceDisconnectedView.kt
View File

@@ -5,10 +5,12 @@ import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.HighlightOff
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
@@ -22,11 +24,12 @@ enum class Reason {
}
@Composable
fun DeviceDisconnectedView(reason: Reason) {
fun DeviceDisconnectedView(reason: Reason, navigateUp: () -> Unit) {
Column(
modifier = Modifier
.fillMaxSize()
.padding(16.dp)
.padding(16.dp),
horizontalAlignment = Alignment.CenterHorizontally
) {
ScreenSection {
Icon(
@@ -62,11 +65,17 @@ fun DeviceDisconnectedView(reason: Reason) {
style = MaterialTheme.typography.bodyMedium
)
}
Spacer(modifier = Modifier.size(16.dp))
Button(onClick = { navigateUp() }) {
Text(text = stringResource(id = R.string.go_up))
}
}
}
@Preview
@Composable
fun DeviceDisconnectedView_Preview() {
DeviceConnectingView()
DeviceConnectingView { }
}

2
lib_theme/src/main/java/no/nordicsemi/android/theme/view/scanner/NoDeviceView.kt
View File

@@ -70,5 +70,5 @@ fun NoDeviceView() {
@Preview
@Composable
fun NoDeviceView_Preview() {
DeviceConnectingView()
DeviceConnectingView { }
}

4
lib_theme/src/main/res/values/strings.xml
View File

@@ -5,10 +5,12 @@
<string name="dialog">Dialog</string>
<string name="cancel">CANCEL</string>
<string name="go_up">Go up</string>
<string name="close_app">Close the application.</string>
<string name="back_screen">Close the current screen.</string>
<string name="disconnect">DISCONNECT</string>
<string name="disconnect">Disconnect</string>
<string name="field_battery">Battery</string>
<string name="device_disconnected">Disconnected</string>