Better UI layout on the device screen

UI Previews was added for service dialogs

app/src/androidTest/java/com/helible/pilot/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
 package com.helible.pilot
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.*
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/main/AndroidManifest.xml

@@ -3,18 +3,34 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <!-- Request legacy Bluetooth permissions on older devices. -->
-    <uses-permission android:name="android.permission.BLUETOOTH" android:maxSdkVersion="30"/>
+    <uses-permission
-    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" android:maxSdkVersion="30"/>
+        android:name="android.permission.BLUETOOTH"
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" android:maxSdkVersion="30"/>
+        android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" android:maxSdkVersion="30"/>
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_ADMIN"
+        android:maxSdkVersion="30" />
+    <uses-permission
+        android:name="android.permission.ACCESS_FINE_LOCATION"
+        android:maxSdkVersion="30" />
+    <uses-permission
+        android:name="android.permission.ACCESS_COARSE_LOCATION"
+        android:maxSdkVersion="30" />
 
     <!-- Request Bluetooth permissions for API level 31+ -->
-    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" android:minSdkVersion="31"
+    <uses-permission
-        android:usesPermissionFlags="neverForLocation" tools:targetApi="s" />
+        android:name="android.permission.BLUETOOTH_SCAN"
-    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" android:minSdkVersion="31"
+        android:minSdkVersion="31"
-        android:usesPermissionFlags="neverForLocation" tools:targetApi="s" />
+        android:usesPermissionFlags="neverForLocation"
+        tools:targetApi="s" />
+    <uses-permission
+        android:name="android.permission.BLUETOOTH_CONNECT"
+        android:minSdkVersion="31"
+        android:usesPermissionFlags="neverForLocation"
+        tools:targetApi="s" />
 
-    <uses-feature android:name="android.hardware.bluetooth" android:required="true"/>
+    <uses-feature
+        android:name="android.hardware.bluetooth"
+        android:required="true" />
 
     <application
         android:allowBackup="true"

app/src/main/java/com/helible/pilot/MainActivity.kt

@@ -6,8 +6,10 @@ import android.widget.Toast
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.BackHandler
 import androidx.activity.compose.setContent
+import androidx.compose.material3.Button
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -15,19 +17,19 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import com.helible.pilot.components.scannerScreen.BluetoothScannerScreen
 import com.helible.pilot.components.deviceScreen.DeviceControlScreen
-import com.helible.pilot.viewmodels.AppPreferences
-import com.helible.pilot.viewmodels.SavedPreferencesImpl
 import com.helible.pilot.components.deviceScreen.defaultDeviceActionsList
+import com.helible.pilot.components.scannerScreen.ScannerScreen
 import com.helible.pilot.permissions.PermissionsLauncher
 import com.helible.pilot.permissions.PermissionsRequest
 import com.helible.pilot.permissions.RequestHardwareFeatures
 import com.helible.pilot.ui.theme.TestblueTheme
+import com.helible.pilot.viewmodels.AppPreferences
 import com.helible.pilot.viewmodels.BluetoothViewModel
 import com.helible.pilot.viewmodels.BluetoothViewModelFactory
 import com.helible.pilot.viewmodels.PermissionDialogViewModel
 import com.helible.pilot.viewmodels.PreferencesViewModel
+import com.helible.pilot.viewmodels.SavedPreferencesImpl
 
 
 class MainActivity : ComponentActivity() {
@@ -101,7 +103,7 @@ class MainActivity : ComponentActivity() {
                         startDestination = "device"
                     ) {
                         composable("scanner") {
-                            BluetoothScannerScreen(
+                            ScannerScreen(
                                 bluetoothState = bluetoothState,
                                 selectedDevice = selectedDevice,
                                 startScan = { bluetoothViewModel.startScan() },
@@ -139,34 +141,58 @@ class MainActivity : ComponentActivity() {
                                         device
                                     )
                                 },
-                                disconnectFromDevice = { bluetoothViewModel.disconnectFromDevice() },
+                                disconnectFromDevice = {
+                                    preferencesViewModel.clearPreferences()
+                                    bluetoothViewModel.disconnectFromDevice()
+                                },
                                 deviceActionsList = defaultDeviceActionsList()
                             )
                             if (preferencesViewModel.preferences != null) BackHandler {}
                         }
-                        composable("console")
+                        composable("console/{title}")
-                        {
+                        { backStackEntry ->
-
+                            NotImplementedPage(
+                                title = backStackEntry.arguments?.getString("title") ?: "null",
+                                navigateBack = { navController.popBackStack() }
+                            )
+                            Button(onClick = { bluetoothViewModel.sendHelloWorld() }) {
+                                Text("Click me!")
                             }
-                        composable("codeblocks")
-                        {
-
                         }
-                        composable("imu_calibration")
+                        composable("codeblocks/{title}")
-                        {
+                        { backStackEntry ->
-
+                            NotImplementedPage(
+                                title = backStackEntry.arguments?.getString("title") ?: "null",
+                                navigateBack = { navController.popBackStack() }
+                            )
                         }
-                        composable("motor_test")
+                        composable("imu_calibration/{title}")
-                        {
+                        { backStackEntry ->
-
+                            NotImplementedPage(
+                                title = backStackEntry.arguments?.getString("title") ?: "null",
+                                navigateBack = { navController.popBackStack() }
+                            )
                         }
-                        composable("pid_settings")
+                        composable("motor_test/{title}")
-                        {
+                        { backStackEntry ->
-
+                            NotImplementedPage(
+                                title = backStackEntry.arguments?.getString("title") ?: "null",
+                                navigateBack = { navController.popBackStack() }
+                            )
                         }
-                        composable("reports")
+                        composable("pid_settings/{title}")
-                        {
+                        { backStackEntry ->
-
+                            NotImplementedPage(
+                                title = backStackEntry.arguments?.getString("title") ?: "null",
+                                navigateBack = { navController.popBackStack() }
+                            )
+                        }
+                        composable("reports/{title}")
+                        { backStackEntry ->
+                            NotImplementedPage(
+                                title = backStackEntry.arguments?.getString("title") ?: "null",
+                                navigateBack = { navController.popBackStack() }
+                            )
                         }
                     }
                 }

app/src/main/java/com/helible/pilot/NotImplementedPage.kt

@@ -0,0 +1,21 @@
+package com.helible.pilot
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.helible.pilot.components.BlankPage
+
+@Composable
+fun NotImplementedPage(title: String, navigateBack: () -> Unit) {
+    BlankPage(title = title, navigateBack = navigateBack) {
+        Column(modifier = Modifier
+            .fillMaxWidth()
+            .padding(10.dp)) {
+            Text(text = "Эта страница пока не готова и находится на стадии разработки")
+        }
+    }
+}

app/src/main/java/com/helible/pilot/components/BlankPage.kt

@@ -0,0 +1,59 @@
+package com.helible.pilot.components
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.ArrowBack
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun BlankPage(title: String, navigateBack: () -> Unit, block: @Composable () -> Unit) {
+    Column(modifier = Modifier.fillMaxSize()) {
+        Row(verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            IconButton(onClick = { navigateBack() }) {
+                Icon(
+                    Icons.Default.ArrowBack,
+                    tint = MaterialTheme.colorScheme.primary,
+                    contentDescription = null
+                )
+            }
+            Text(
+                text = title,
+                fontSize = 18.sp,
+                fontWeight = FontWeight.ExtraBold,
+                modifier = Modifier.padding(horizontal = 10.dp, vertical = 8.dp)
+            )
+        }
+        block()
+    }
+}
+
+@Preview
+@Composable
+fun BlankPagePreview() {
+    Surface {
+        BlankPage(title = "Blank page", navigateBack = {}) {
+            Column(modifier = Modifier
+                .fillMaxWidth()
+                .padding(5.dp)) {
+                Text(text = "This page in development")
+            }
+        }
+    }
+}

app/src/main/java/com/helible/pilot/components/FeatureRequestDialog.kt

@@ -6,8 +6,8 @@ import androidx.compose.material3.Divider
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
 
 @Composable
 fun RequiredHardwareFeatures(
@@ -36,3 +36,16 @@ fun RequiredHardwareFeatures(
         )
     }
 }
+
+@Preview
+@Composable
+fun RequiredHardwareFeaturesPreview() {
+    RequiredHardwareFeatures(
+        title = "Turn on Bluetooth",
+        description = "App requires Bluetooth turned on to continue",
+        confirmButtonText = "Turn on",
+        featureState = false,
+        requestFeature = {},
+        onDismissRequest = {}
+    )
+}

app/src/main/java/com/helible/pilot/components/PermissionDialog.kt

@@ -6,13 +6,14 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Divider
 import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 
 @Composable
@@ -82,6 +83,16 @@ fun PermissionDialog(
     )
 }
 
+@Preview
+@Composable
+fun PermissionDialogPreview() {
+    PermissionDialog(
+        LocationPermissionTextProvider(),
+        false,
+        {}, {}, {}, {}
+    )
+}
+
 interface PermissionTextProvider {
     fun getDescription(isPermanentDeclined: Boolean): String
 }

app/src/main/java/com/helible/pilot/components/Title.kt

@@ -5,15 +5,20 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.TextUnit
 import androidx.compose.ui.unit.sp
 
 @Composable
-fun Title(text: String, modifier: Modifier = Modifier) {
+fun Title(
+    text: String,
+    modifier: Modifier = Modifier,
+    fontSize: TextUnit = 23.sp,
+) {
     Text(
         text = text,
         textAlign = TextAlign.Center,
         modifier = modifier,
-        fontSize = 23.sp,
+        fontSize = fontSize,
         fontWeight = FontWeight.ExtraBold
     )
 }

app/src/main/java/com/helible/pilot/components/deviceScreen/DeviceBadge.kt

@@ -32,7 +32,7 @@ import com.helible.pilot.viewmodels.AppPreferences
 fun DeviceBadge(
     bluetoothUiState: BluetoothUiState,
     tryToReconnect: () -> Unit,
-    getPreferences: () -> AppPreferences?
+    getPreferences: () -> AppPreferences?,
 ) {
     ElevatedCard(
         modifier = Modifier

app/src/main/java/com/helible/pilot/components/deviceScreen/DeviceConnectionStatus.kt

@@ -31,8 +31,7 @@ fun DeviceConnectionStatus(bluetoothState: BluetoothUiState) {
                     .padding(2.dp)
             )
             Text("На связи")
-        }
+        } else if (bluetoothState.errorMessage != null) {
-        else if (bluetoothState.errorMessage != null) {
             Icon(
                 painter = painterResource(id = R.drawable.cancel),
                 contentDescription = null,
@@ -42,8 +41,7 @@ fun DeviceConnectionStatus(bluetoothState: BluetoothUiState) {
                     .padding(2.dp)
             )
             Text("Ошибка: ${bluetoothState.errorMessage}")
-        }
+        } else if (bluetoothState.isConnecting) {
-        else if (bluetoothState.isConnecting) {
             Icon(
                 painter = painterResource(id = R.drawable.sync),
                 contentDescription = null,

app/src/main/java/com/helible/pilot/components/deviceScreen/DeviceControlScreen.kt

@@ -1,20 +1,12 @@
 package com.helible.pilot.components.deviceScreen
 
-import androidx.compose.foundation.Image
+import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.background
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.requiredSize
 import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Refresh
-import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
@@ -25,7 +17,6 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
@@ -46,7 +37,7 @@ fun DeviceControlScreen(
     scannerPageName: String = "scanner",
 ) {
     LaunchedEffect(Unit) {
-        val preferences: AppPreferences? = getPreferences()
+        val preferences = getPreferences()
         if (preferences == null) {
             navigateToPage(scannerPageName)
         } else {
@@ -90,13 +81,21 @@ fun DeviceControlScreen(
 
         Column(modifier = Modifier.padding(horizontal = 3.dp)) {
             for (section in deviceActionsList) {
-                Text(section.key,
+                Text(
+                    section.key,
                     color = Color.Gray,
                     fontWeight = FontWeight.Light,
                     modifier = Modifier.padding(vertical = 15.dp, horizontal = 10.dp)
                 )
                 for (action in section.value) {
-                    TextButton(onClick = { /* TODO */}) {
+                    TextButton(
+                        onClick = { navigateToPage(action.first + '/' + action.second.second) },
+                        modifier = Modifier.fillMaxWidth()
+                    ) {
+                        Row(modifier = Modifier.fillMaxWidth(),
+                            horizontalArrangement = Arrangement.spacedBy(5.dp),
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
                             Icon(
                                 painter = painterResource(id = action.second.first.first),
                                 tint = action.second.first.second,
@@ -105,12 +104,12 @@ fun DeviceControlScreen(
                             )
                             Text(
                                 text = action.second.second,
-                            color = MaterialTheme.colorScheme.inverseSurface,
+                                color = MaterialTheme.colorScheme.inverseSurface
-                            modifier = Modifier.padding(horizontal = 5.dp)
                             )
                         }
                     }
                 }
+            }
 
             TextButton(onClick = {
                 disconnectFromDevice()

app/src/main/java/com/helible/pilot/components/scannerScreen/DeviceItem.kt

@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxHeight
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material3.CardDefaults
@@ -22,8 +21,9 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.helible.pilot.dataclasses.BluetoothDevice
 import com.helible.pilot.R
+import com.helible.pilot.dataclasses.BluetoothDevice
+
 
 @SuppressLint("MissingPermission")
 @Composable
@@ -44,7 +44,12 @@ fun DeviceItem(
         )
     ) {
         Row(modifier = Modifier.padding(8.dp)) {
-            Column(verticalArrangement = Arrangement.Center, modifier = Modifier.fillMaxHeight()) {
+            Column(
+                verticalArrangement = Arrangement.Center,
+                modifier = Modifier
+                    .fillMaxHeight()
+                    .weight(1f, true)
+            ) {
                 Text(
                     text = deviceInfo.name,
                     fontWeight = FontWeight.Bold,
@@ -56,9 +61,10 @@ fun DeviceItem(
                 )
             }
             if (deviceInfo.isScanned) {
-                Box(contentAlignment = Alignment.CenterEnd, modifier = Modifier.fillMaxSize()) {
+                val icon = getSignalIconForRssiValue(deviceInfo.rssi)
+                Box(contentAlignment = Alignment.CenterEnd, modifier = Modifier.weight(0.3f)) {
                     Icon(
-                        painterResource(id = getSignalIconForRssiValue(deviceInfo.rssi)),
+                        painterResource(id = icon),
                         contentDescription = null,
                         modifier = Modifier
                             .fillMaxHeight()

app/src/main/java/com/helible/pilot/components/scannerScreen/DiscoveredDevicesList.kt

@@ -7,16 +7,17 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.helible.pilot.components.scannerScreen.DeviceItem
-import com.helible.pilot.dataclasses.BluetoothUiState
 import com.helible.pilot.dataclasses.BluetoothDevice
+import com.helible.pilot.dataclasses.BluetoothUiState
 
 @Composable
 fun DiscoveredDevicesList(
@@ -102,3 +103,26 @@ fun DiscoveredDevicesList(
         }
     }
 }
+
+@Preview
+@Composable
+fun DiscoveredDevicesListPreview() {
+    val state = BluetoothUiState(
+        pairedBluetoothDevices = listOf(
+            BluetoothDevice("My car", "AA:BB:CC:DD:FF", -70, false),
+            BluetoothDevice("Speaker", "AA:BB:CC:DD:FF", -20, false),
+            BluetoothDevice("My TV", "AA:BB:CC:DD:FF", 10, false),
+            BluetoothDevice("My phone", "AA:BB:CC:DD:FF", -50, false),
+            BluetoothDevice("Mi Band 6", "AA:BB:CC:DD:FF", -100, false),
+        ),
+        scannedBluetoothDevices = listOf(
+            BluetoothDevice("Watch", "AA:BB:CC:DD:FF", -10, true),
+            BluetoothDevice("Mi Cleaner", "AA:BB:CC:DD:FF", -90, true),
+            BluetoothDevice("My fridge", "AA:BB:CC:DD:FF", -100, true),
+            BluetoothDevice("Unknown device", "AA:BB:CC:DD:FF", -130, true)
+        )
+    )
+    Surface {
+        DiscoveredDevicesList(bluetoothState = state, selectedDevice = null, choiceDevice = {})
+    }
+}

app/src/main/java/com/helible/pilot/components/scannerScreen/ScannerScreen.kt

@@ -18,17 +18,18 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import com.helible.pilot.components.Title
-import com.helible.pilot.dataclasses.BluetoothUiState
 import com.helible.pilot.dataclasses.BluetoothDevice
+import com.helible.pilot.dataclasses.BluetoothUiState
 
 
 @SuppressLint("MissingPermission")
 @Composable
-fun BluetoothScannerScreen(
+fun ScannerScreen(
     bluetoothState: BluetoothUiState,
     selectedDevice: BluetoothDevice?,
     startScan: () -> Unit,
@@ -107,3 +108,32 @@ fun BluetoothScannerScreen(
         }
     }
 }
+
+@Preview
+@Composable
+fun ScannerScreenPreview() {
+    val state = BluetoothUiState(
+        pairedBluetoothDevices = listOf(
+            BluetoothDevice("My car", "AA:BB:CC:DD:FF", -70, false),
+            BluetoothDevice("Speaker", "AA:BB:CC:DD:FF", -20, false),
+            BluetoothDevice("My TV", "AA:BB:CC:DD:FF", 10, false),
+            BluetoothDevice("My phone", "AA:BB:CC:DD:FF", -50, false),
+            BluetoothDevice("Mi Band 6", "AA:BB:CC:DD:FF", -100, false),
+        ),
+        scannedBluetoothDevices = listOf(
+            BluetoothDevice("Watch", "AA:BB:CC:DD:FF", -10, true),
+            BluetoothDevice("Mi Cleaner", "AA:BB:CC:DD:FF", -90, true),
+            BluetoothDevice("My fridge", "AA:BB:CC:DD:FF", -100, true),
+            BluetoothDevice("Unknown device", "AA:BB:CC:DD:FF", -130, true)
+        )
+    )
+    Surface {
+        ScannerScreen(
+            state,
+            state.scannedBluetoothDevices[1],
+            {}, {},
+            { _ -> },
+            {},
+        )
+    }
+}

app/src/main/java/com/helible/pilot/controllers/BluetoothController.kt

@@ -14,9 +14,9 @@ import android.os.Build
 import android.util.Log
 import android.widget.Toast
 import androidx.activity.ComponentActivity
-import com.helible.pilot.BluetoothDataTransferService
+import com.helible.pilot.viewmodels.BluetoothDataTransferService
-import com.helible.pilot.dataclasses.BluetoothDeviceDomain
 import com.helible.pilot.KMessage
+import com.helible.pilot.dataclasses.BluetoothDeviceDomain
 import com.helible.pilot.receivers.BluetoothAdapterStateReceiver
 import com.helible.pilot.receivers.BluetoothStateReceiver
 import kotlinx.coroutines.CoroutineScope
@@ -40,7 +40,7 @@ import java.util.UUID
 
 sealed interface ConnectionResult {
     object ConnectionEstablished : ConnectionResult
-    data class TransferSucceded(val message: KMessage) : ConnectionResult
+    data class TransferSucceded(val message: String) : ConnectionResult
     data class Error(val message: String) : ConnectionResult
 }
 
@@ -219,6 +219,7 @@ class AndroidBluetoothController(private val context: Context) : BluetoothContro
             return flow {}
         }
         return flow {
+            Log.i("BluetoothController", "Connecting to device...")
             currentClientSocket =
                 bluetoothAdapter.getRemoteDevice(device).createRfcommSocketToServiceRecord(
                     UUID.fromString(SERVICE_UUID)
@@ -235,7 +236,9 @@ class AndroidBluetoothController(private val context: Context) : BluetoothContro
                         )
                     }
                 } catch (e: IOException) {
-                    closeConnection()
+                    socket.close()
+                    currentClientSocket = null
+                    Log.e("BluetoothController", e.toString())
                     emit(ConnectionResult.Error("Connection was interrupted"))
                 }
             }
@@ -256,6 +259,7 @@ class AndroidBluetoothController(private val context: Context) : BluetoothContro
     override fun closeConnection() {
         currentClientSocket?.close()
         currentClientSocket = null
+        Log.i("BluetoothController", "Connection closed")
     }
 
     override fun onDestroy() {

app/src/main/java/com/helible/pilot/controllers/DeviceState.kt

@@ -0,0 +1,9 @@
+package com.helible.pilot.controllers
+
+data class DeviceState(
+    val isHandshakeWaiting: Boolean = true,
+    val isIMUCalibrating: Boolean = false,
+    val flightMode: Boolean = false,
+    val batteryCharge: Int?,
+    val flightHeight: Float?
+)

app/src/main/java/com/helible/pilot/receivers/BluetoothAdapterStateReceiver.kt

@@ -1,13 +1,10 @@
 package com.helible.pilot.receivers
 
-import android.annotation.SuppressLint
 import android.bluetooth.BluetoothAdapter
-import android.bluetooth.BluetoothDevice
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.location.LocationManager
-import android.os.Build
 
 class BluetoothAdapterStateReceiver(
     private val onBluetoothEnabledChanged: (isBluetoothEnabled: Boolean) -> Unit,

app/src/main/java/com/helible/pilot/viewmodels/BluetoothDataTransferService.kt

@@ -1,6 +1,9 @@
-package com.helible.pilot
+package com.helible.pilot.viewmodels
 
 import android.bluetooth.BluetoothSocket
+import android.util.Log
+import com.helible.pilot.KMessage
+import com.helible.pilot.toKMessage
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -14,7 +17,7 @@ class TransferFailedException : IOException("Reading incoming data failed")
 class BluetoothDataTransferService(
     private val socket: BluetoothSocket,
 ) {
-    fun listenForIncomingMessages(): Flow<KMessage> {
+    fun listenForIncomingMessages(): Flow<String> {
         return flow {
             if (!socket.isConnected)
                 return@flow
@@ -25,11 +28,11 @@ class BluetoothDataTransferService(
                 } catch (e: IOException) {
                     throw TransferFailedException()
                 }
+                val strData: String = buffer.decodeToString(endIndex = byteCount)
                 emit(
-                    buffer.decodeToString(
+                    strData
-                        endIndex = byteCount
-                    ).toKMessage()
                 )
+                Log.i("BluetoothController", "Received: ${strData.dropLast(2)}")
             }
         }.flowOn(Dispatchers.IO)
     }

app/src/main/java/com/helible/pilot/viewmodels/BluetoothViewModel.kt

@@ -2,12 +2,13 @@ package com.helible.pilot.viewmodels
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.helible.pilot.controllers.BluetoothController
+import com.helible.pilot.controllers.ConnectionResult
 import com.helible.pilot.dataclasses.AlarmStateMessage
+import com.helible.pilot.dataclasses.BluetoothDevice
 import com.helible.pilot.dataclasses.BluetoothUiState
 import com.helible.pilot.dataclasses.EmergStopMessage
 import com.helible.pilot.dataclasses.RotorsSpeedMessage
-import com.helible.pilot.controllers.BluetoothController
-import com.helible.pilot.controllers.ConnectionResult
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
 import kotlinx.coroutines.Job
@@ -24,7 +25,6 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.launch
-import com.helible.pilot.dataclasses.BluetoothDevice
 
 class BluetoothViewModel(
     private val bluetoothController: BluetoothController,
@@ -94,7 +94,9 @@ class BluetoothViewModel(
                 }
 
                 is ConnectionResult.TransferSucceded -> {
-                    TODO("Telemetry not implemented")
+                    _state.update { it.copy(
+
+                    ) }
                 }
 
                 is ConnectionResult.Error -> {
@@ -108,14 +110,12 @@ class BluetoothViewModel(
                 }
             }
         }
-            .catch { _ ->
+            .catch { throwable ->
                 bluetoothController.closeConnection()
-                _state.update {
+                _state.update { it.copy(
-                    it.copy(
                     isConnected = false,
                     isConnecting = false
-                    )
+                ) }
-                }
             }
             .launchIn(viewModelScope)
     }
@@ -123,7 +123,7 @@ class BluetoothViewModel(
     private var deviceConnectionJob: Job? = null
 
     fun connectToDevice(device: String) {
-        if(_state.value.isConnected) {
+        if (_state.value.isConnected and _state.value.isConnecting) {
             return
         }
         _state.update { it.copy(isConnecting = true) }
@@ -162,36 +162,12 @@ class BluetoothViewModel(
         super.onCleared()
     }
 
-    fun sendRotorsDutySpeed(rotorsState: RotorsSpeedMessage) {
+    fun sendHelloWorld() {
         viewModelScope.launch {
             bluetoothController.trySendMessage(
-                rotorsStateMessegeAdapter.toJson(rotorsState).plus("\r").toByteArray()
+                "{\"p1\": {\"p\": 1.5, \"i\": 1.5, \"d\": 1.5}}\n\r".toByteArray()
+                //"{\"p1\": [1.5, 1.5, 1.5]}\n\r".toByteArray()
             )
         }
     }
-
-    fun sendAlarmState(alarmStateMessage: AlarmStateMessage) {
-        viewModelScope.launch {
-            bluetoothController.trySendMessage(
-                alarmStateMessageAdapter.toJson(alarmStateMessage).plus("\r").toByteArray()
-            )
-        }
-    }
-
-    fun sendEmergStop() {
-        viewModelScope.launch {
-            bluetoothController.trySendMessage(
-                emergStopMessageAdapter.toJson(EmergStopMessage(true)).plus("\r").toByteArray()
-            )
-        }
-    }
-
-    fun sendR3Duty(r3: Int) {
-        viewModelScope.launch {
-            bluetoothController.trySendMessage(
-                "R3$r3\n\r".toByteArray()
-            )
-            delay(30)
-        }
-    }
 }

app/src/main/res/drawable/ic_android_black_24dp.xml

@@ -1,5 +1,10 @@
-<vector android:height="24dp" android:tint="#000000"
+<vector android:height="24dp"
-    android:viewportHeight="24" android:viewportWidth="24"
+    android:tint="#000000"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:viewportHeight="24"
-    <path android:fillColor="#FF000000" android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z"/>
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.6,11.48 L19.44,8.3a0.63,0.63 0,0 0,-1.09 -0.63l-1.88,3.24a11.43,11.43 0,0 0,-8.94 0L5.65,7.67a0.63,0.63 0,0 0,-1.09 0.63L6.4,11.48A10.81,10.81 0,0 0,1 20L23,20A10.81,10.81 0,0 0,17.6 11.48ZM7,17.25A1.25,1.25 0,1 1,8.25 16,1.25 1.25,0 0,1 7,17.25ZM17,17.25A1.25,1.25 0,1 1,18.25 16,1.25 1.25,0 0,1 17,17.25Z" />
 </vector>

app/src/main/res/drawable/signal_icon1.xml

@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="500" android:viewportHeight="500">
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="500"
+    android:viewportHeight="500">
     <path
         android:fillColor="?android:colorPrimary"
         android:pathData="M 15 340 L 80 340 Q 95 340 95 355 L 95 485 Q 95 500 80 500 L 15 500 Q 0 500 0 485 L 0 355 Q 0 340 15 340 Z" />

app/src/test/java/com/helible/pilot/ExampleUnitTest.kt

@@ -1,9 +1,8 @@
 package com.helible.pilot
 
+import org.junit.Assert.assertEquals
 import org.junit.Test
 
-import org.junit.Assert.*
-
 /**
  * Example local unit test, which will execute on the development machine (host).
  *