Merge pull request #33 from NordicSemiconductor/polishing

Code improvements

Author: philips77

app/build.gradle.kts

@@ -1,9 +1,7 @@
 /*
+ * Copyright (c) 2022, Nordic Semiconductor
  *
- *  * Copyright (c) 2022, Nordic Semiconductor
- *  *
- *  * SPDX-License-Identifier: Apache-2.0
- *
+ * SPDX-License-Identifier: Apache-2.0
  */
 plugins {
     // https://github.com/NordicSemiconductor/Android-Gradle-Plugins/blob/main/plugins/src/main/kotlin/AndroidApplicationComposeConventionPlugin.kt
@@ -12,7 +10,6 @@ plugins {
     alias(libs.plugins.nordic.hilt)
 }
 
-
 android {
     namespace = "no.nordicsemi.android.ei"
     defaultConfig {
@@ -25,8 +22,7 @@ dependencies {
     implementation(libs.nordic.theme)
     implementation(libs.nordic.ble.ktx)
     implementation(libs.nordic.mcumgr.ble)
-    // Added as a workaround for missing class when using slf4j from the current mcumgr library
-    implementation("org.slf4j:slf4j-nop:1.7.30")
+    implementation(libs.slf4j.timber)
 
     implementation(libs.androidx.navigation.compose)
     implementation(libs.androidx.compose.material.iconsExtended)
@@ -49,8 +45,8 @@ dependencies {
 
     implementation(libs.coil.kt.compose)
     implementation(libs.gson)
-    testImplementation("com.google.truth:truth:1.4.2")
 
+    testImplementation(libs.truth)
     testImplementation(libs.junit4)
     testImplementation(libs.kotlin.junit)
     testImplementation(libs.androidx.test.core)

app/src/main/java/no/nordicsemi/android/ei/ui/Deployment.kt

@@ -167,7 +167,6 @@ private fun DeployImpulse(
     onCancelDeployClick: () -> Unit
 ) {
     var isDevicesMenuExpanded by remember { mutableStateOf(false) }
-    var width by rememberSaveable { mutableIntStateOf(0) }
     val isEnabled = shouldEnable(
         connectedDevices = connectedDevices,
         deploymentState = deploymentState
@@ -195,8 +194,7 @@ private fun DeployImpulse(
                     OutlinedTextField(
                         modifier = Modifier
                             .fillMaxWidth()
-                            .menuAnchor(type = MenuAnchorType.PrimaryNotEditable, enabled = isEnabled)
-                            .onSizeChanged { width = it.width },
+                            .menuAnchor(type = MenuAnchorType.PrimaryNotEditable, enabled = isEnabled),
                         value = deploymentTarget?.name ?: stringResource(id = R.string.empty),
                         enabled = isEnabled,
                         onValueChange = { },

app/src/main/java/no/nordicsemi/android/ei/ui/InferencingScreen.kt

@@ -121,7 +121,6 @@ private fun StartInferencing(
     sendInferencingRequest: (InferencingRequest) -> Unit
 ) {
     var isDevicesMenuExpanded by remember { mutableStateOf(false) }
-    var width by rememberSaveable { mutableIntStateOf(0) }
 
     if (isLargeScreen || isLandscape) {
         Row(
@@ -147,8 +146,7 @@ private fun StartInferencing(
                         .menuAnchor(
                             type = MenuAnchorType.PrimaryNotEditable,
                             enabled = connectedDevices.isNotEmpty()
-                        )
-                        .onSizeChanged { width = it.width },
+                        ),
                     value = inferencingTarget?.name ?: stringResource(id = R.string.empty),
                     enabled = connectedDevices.isNotEmpty(),
                     onValueChange = { },
@@ -226,8 +224,7 @@ private fun StartInferencing(
                     .menuAnchor(
                         type = MenuAnchorType.PrimaryNotEditable,
                         enabled = connectedDevices.isNotEmpty()
-                    )
-                    .onSizeChanged { width = it.width },
+                    ),
                 value = inferencingTarget?.name ?: stringResource(id = R.string.empty),
                 enabled = connectedDevices.isNotEmpty(),
                 onValueChange = { },

app/src/main/java/no/nordicsemi/android/ei/viewmodels/ProjectViewModel.kt

@@ -482,9 +482,10 @@ class ProjectViewModel @Inject constructor(
      * Starts firmware deployment
      */
     fun deploy() {
-        deploymentJob = viewModelScope.launch(CoroutineExceptionHandler { _, throwable ->
+        val handler = CoroutineExceptionHandler { _, throwable ->
             viewModelScope.launch { eventChannel.send(Event.Error(throwable)) }
-        }) {
+        }
+        deploymentJob = viewModelScope.launch(handler) {
             projectRepository.deploymentInfo(
                 projectId = project.id,
                 keys = keys