Fix compilation issues

app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt

@@ -43,12 +43,8 @@ import no.nordicsemi.android.common.navigation.NavigationView
 import no.nordicsemi.android.common.theme.NordicActivity
 import no.nordicsemi.android.common.theme.NordicTheme
 import no.nordicsemi.android.gls.GLSDestination
-import no.nordicsemi.android.gls.GLSDestinations
-import no.nordicsemi.android.navigation.NavigationView
 import no.nordicsemi.android.nrftoolbox.repository.ActivitySignals
-import no.nordicsemi.android.theme.NordicTheme
 import no.nordicsemi.android.toolbox.scanner.ScannerDestination
-import no.nordicsemi.ui.scanner.ScannerDestinations
 import javax.inject.Inject
 
 @AndroidEntryPoint

app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt

@@ -35,9 +35,11 @@ import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -51,7 +53,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import no.nordicsemi.android.theme.ScreenSection
 import no.nordicsemi.android.nrftoolbox.R
 
 @Composable
@@ -63,7 +64,7 @@ fun FeatureButton(
     @StringRes description: Int? = null,
     onClick: () -> Unit
 ) {
-    ScreenSection(onClick = onClick) {
+    OutlinedCard(modifier = Modifier.clickable { onClick() }) {
         Row(
             modifier = Modifier.fillMaxWidth(),
             verticalAlignment = Alignment.CenterVertically,

app/src/main/java/no/nordicsemi/android/nrftoolbox/view/TitleAppBar.kt

@@ -31,15 +31,17 @@
 
 package no.nordicsemi.android.nrftoolbox.view
 
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SmallTopAppBar
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.colorResource
-import no.nordicsemi.analytics.view.AnalyticsPermissionButton
+import no.nordicsemi.android.common.analytics.view.AnalyticsPermissionButton
-import no.nordicsemi.android.theme.R
+import no.nordicsemi.android.nrftoolbox.R
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun TitleAppBar(text: String) {
     SmallTopAppBar(

app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt

@@ -31,9 +31,11 @@
 
 package no.nordicsemi.android.nrftoolbox.viewmodel
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
+import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.launchIn
@@ -56,6 +58,8 @@ import javax.inject.Inject
 
 @HiltViewModel
 class HomeViewModel @Inject constructor(
+    @ApplicationContext
+    private val context: Context,
     private val navigationManager: Navigator,
     private val activitySignals: ActivitySignals,
     cgmRepository: CGMRepository,
@@ -110,8 +114,7 @@ class HomeViewModel @Inject constructor(
     }
 
     fun openLogger() {
-        NordicLogger.Companion.launch()
+        NordicLogger.launch(context, logger = null)
-        loggerAppRunner.runLogger()
     }
 
     fun logEvent(event: ProfileOpenEvent) {

lib_utils/build.gradle.kts

@@ -30,7 +30,7 @@
  */
 
 plugins {
-    alias(libs.plugins.nordic.library)
+    alias(libs.plugins.nordic.feature)
     alias(libs.plugins.kotlin.serialization)
 }
 

profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsScreen.kt

@@ -33,6 +33,7 @@ package no.nordicsemi.android.gls.details.view
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.navigation.compose.hiltViewModel
 import no.nordicsemi.android.gls.R
@@ -42,7 +43,7 @@ import no.nordicsemi.android.ui.view.LoggerBackIconAppBar
 @Composable
 internal fun GLSDetailsScreen() {
     val viewModel: GLSDetailsViewModel = hiltViewModel()
-    val record = viewModel.record
+    val record = viewModel.record.collectAsState().value
 
     Column {
         LoggerBackIconAppBar(stringResource(id = R.string.gls_title)) {

profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt

@@ -36,9 +36,9 @@ import androidx.lifecycle.lifecycleScope
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
+import no.nordicsemi.android.common.ui.scanner.model.DiscoveredBluetoothDevice
 import no.nordicsemi.android.service.DEVICE_DATA
 import no.nordicsemi.android.service.NotificationService
-import no.nordicsemi.ui.scanner.DiscoveredBluetoothDevice
 import javax.inject.Inject
 
 @AndroidEntryPoint

profile_uart/build.gradle.kts

@@ -32,19 +32,17 @@
 plugins {
     alias(libs.plugins.nordic.feature)
     alias(libs.plugins.kotlin.serialization)
-//    id("com.google.protobuf")
     alias(libs.plugins.kotlin.kapt)
+    alias(libs.plugins.wire)
 }
 
 android {
     namespace = "no.nordicsemi.android.uart"
 }
-//
+
-//protobuf {
+wire {
-//    protoc {
+    kotlin {}
-//        artifact = "com.google.protobuf:protoc:3.14.0"
+}
-//    }
-//}
 
 dependencies {
     implementation(project(":lib_analytics"))

profile_uart/src/main/java/no/nordicsemi/android/uart/data/MacroSerializer.kt

@@ -39,11 +39,11 @@ import java.io.InputStream
 import java.io.OutputStream
 
 object MacroSerializer : Serializer<MacroSettings> {
-    override val defaultValue: MacroSettings = MacroSettings.getDefaultInstance()
+    override val defaultValue: MacroSettings = MacroSettings()
 
     override suspend fun readFrom(input: InputStream): MacroSettings {
         try {
-            return MacroSettings.parseFrom(input)
+            return  MacroSettings.ADAPTER.decode(input)
         } catch (exception: InvalidProtocolBufferException) {
             throw CorruptionException("Cannot read proto.", exception)
         }
@@ -52,5 +52,5 @@ object MacroSerializer : Serializer<MacroSettings> {
     override suspend fun writeTo(
         t: MacroSettings,
         output: OutputStream
-    ) = t.writeTo(output)
+    ) = MacroSettings.ADAPTER.encode(output, t)
 }