From 0b705a20e764785ce4ffd519e68d52b3971f3bfd Mon Sep 17 00:00:00 2001 From: Sylwester Zielinski Date: Fri, 20 Jan 2023 15:52:18 +0100 Subject: [PATCH] Fix compilation issues --- .../no/nordicsemi/android/nrftoolbox/MainActivity.kt | 4 ---- .../android/nrftoolbox/view/FeatureButton.kt | 5 +++-- .../android/nrftoolbox/view/TitleAppBar.kt | 6 ++++-- .../android/nrftoolbox/viewmodel/HomeViewModel.kt | 7 +++++-- lib_utils/build.gradle.kts | 2 +- .../android/gls/details/view/GLSDetailsScreen.kt | 3 ++- .../android/rscs/repository/RSCSService.kt | 2 +- profile_uart/build.gradle.kts | 12 +++++------- .../nordicsemi/android/uart/data/MacroSerializer.kt | 6 +++--- 9 files changed, 24 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt index d24ee4b5..e5a8682b 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/MainActivity.kt +++ b/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 diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt index 0dc74494..73186931 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/FeatureButton.kt +++ b/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, diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/TitleAppBar.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/TitleAppBar.kt index 023d2895..50057e80 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/view/TitleAppBar.kt +++ b/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.theme.R +import no.nordicsemi.android.common.analytics.view.AnalyticsPermissionButton +import no.nordicsemi.android.nrftoolbox.R +@OptIn(ExperimentalMaterial3Api::class) @Composable fun TitleAppBar(text: String) { SmallTopAppBar( diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt index 9d1063ba..03322ab9 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/viewmodel/HomeViewModel.kt +++ b/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() - loggerAppRunner.runLogger() + NordicLogger.launch(context, logger = null) } fun logEvent(event: ProfileOpenEvent) { diff --git a/lib_utils/build.gradle.kts b/lib_utils/build.gradle.kts index 4e00c465..9657da5e 100644 --- a/lib_utils/build.gradle.kts +++ b/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) } diff --git a/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsScreen.kt b/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsScreen.kt index eb5607b4..07791fac 100644 --- a/profile_gls/src/main/java/no/nordicsemi/android/gls/details/view/GLSDetailsScreen.kt +++ b/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)) { diff --git a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt b/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt index e6caaac9..4359dab3 100644 --- a/profile_rscs/src/main/java/no/nordicsemi/android/rscs/repository/RSCSService.kt +++ b/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 diff --git a/profile_uart/build.gradle.kts b/profile_uart/build.gradle.kts index ce2c1552..9fa2df04 100644 --- a/profile_uart/build.gradle.kts +++ b/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 { -// protoc { -// artifact = "com.google.protobuf:protoc:3.14.0" -// } -//} + +wire { + kotlin {} +} dependencies { implementation(project(":lib_analytics")) diff --git a/profile_uart/src/main/java/no/nordicsemi/android/uart/data/MacroSerializer.kt b/profile_uart/src/main/java/no/nordicsemi/android/uart/data/MacroSerializer.kt index 5f8044ad..f42e91be 100644 --- a/profile_uart/src/main/java/no/nordicsemi/android/uart/data/MacroSerializer.kt +++ b/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 { - 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 { override suspend fun writeTo( t: MacroSettings, output: OutputStream - ) = t.writeTo(output) + ) = MacroSettings.ADAPTER.encode(output, t) }