mirror of
https://github.com/aljazceru/Android-nRF-Toolbox.git
synced 2026-01-08 09:14:23 +01:00
Fix compilation issues
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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(
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user