diff --git a/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt b/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt index 2d20ca47..a9254e24 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt @@ -2,7 +2,6 @@ package no.nordicsemi.android.nrftoolbox import android.app.Activity import android.os.ParcelUuid -import android.util.Log import androidx.activity.compose.BackHandler import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect @@ -47,8 +46,8 @@ internal fun HomeScreen() { startDestination = NavigationId.HOME.id ) { composable(NavigationId.SCANNER.id) { - val profile = viewModel.profile!! - FindDeviceScreen(ParcelUuid(profile.uuid)) { +// val profile = viewModel.profile!! + FindDeviceScreen(ParcelUuid(Profile.CSC.uuid)) { viewModel.onScannerFlowResult(it) } } diff --git a/settings.gradle b/settings.gradle index aff91c5a..beda6bd0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -14,22 +14,22 @@ dependencyResolutionManagement { alias('nordic-theme').to('no.nordicsemi.android.common:theme:1.0.0') alias('nordic-ble-common').to('no.nordicsemi.android:ble-common:2.3.1') alias('nordic-log').to('no.nordicsemi.android:log:2.3.0') - alias('nordic-scanner').to('no.nordicsemi.android.support.v18:scanner:1.5.0') + alias('nordic-scanner').to('no.nordicsemi.android.support.v18:scanner:1.6.0') alias('nordic-ui-scanner').to('no.nordicsemi.android.common:scanner:1.0.0') alias('nordic-dfu').to('no.nordicsemi.android:dfu:1.12.1-beta01') - alias('localbroadcastmanager').to('androidx.localbroadcastmanager:localbroadcastmanager:1.0.0') - alias('material').to('com.google.android.material:material:1.5.0-beta01') + alias('localbroadcastmanager').to('androidx.localbroadcastmanager:localbroadcastmanager:1.1.0') + alias('material').to('com.google.android.material:material:1.6.0-alpha01') - version('lifecycle', '2.3.1') + version('lifecycle', '2.4.0') alias('lifecycle-activity').to('androidx.lifecycle', 'lifecycle-runtime-ktx').versionRef('lifecycle') alias('lifecycle-service').to('androidx.lifecycle', 'lifecycle-service').versionRef('lifecycle') - alias('androidx-core').to('androidx.core:core-ktx:1.6.0') - alias('compose-activity').to('androidx.activity:activity-compose:1.3.1') - alias('compose-lifecycle').to('androidx.lifecycle:lifecycle-viewmodel-compose:1.0.0-alpha07') + alias('androidx-core').to('androidx.core:core-ktx:1.7.0') + alias('compose-activity').to('androidx.activity:activity-compose:1.4.0') + alias('compose-lifecycle').to('androidx.lifecycle:lifecycle-viewmodel-compose:2.4.0') - version('compose', '1.0.2') + version('compose', '1.0.5') alias('compose-livedata').to('androidx.compose.runtime', 'runtime-livedata').versionRef('compose') alias('compose-ui').to('androidx.compose.ui', 'ui').versionRef('compose') alias('compose-material').to('androidx.compose.material3:material3:1.0.0-alpha01') @@ -40,9 +40,9 @@ dependencyResolutionManagement { version('hilt', '2.38.1') alias('hilt-android').to('com.google.dagger', 'hilt-android').versionRef('hilt') alias('hilt-compiler').to('com.google.dagger', 'hilt-compiler').versionRef('hilt') - alias('hilt-compose').to('androidx.hilt:hilt-navigation-compose:1.0.0-alpha03') - alias('hilt-lifecycle').to('androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha02') - alias('hilt-lifecyclecompiler').to('androidx.hilt:hilt-compiler:1.0.0-alpha02') + alias('hilt-compose').to('androidx.hilt:hilt-navigation-compose:1.0.0-rc01') + alias('hilt-lifecycle').to('androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03') + alias('hilt-lifecyclecompiler').to('androidx.hilt:hilt-compiler:1.0.0') bundle('hilt', ['hilt-android', 'hilt-compose', 'hilt-lifecycle']) bundle('hiltkapt', ['hilt-compiler', 'hilt-lifecyclecompiler']) @@ -54,7 +54,6 @@ dependencyResolutionManagement { alias('kotlin-coroutines').to('org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2') alias('google-permissions').to('com.google.accompanist:accompanist-permissions:0.18.0') alias('chart').to('com.github.PhilJay:MPAndroidChart:v3.1.0') - alias('scanner').to('no.nordicsemi.android.support.v18:scanner:1.6.0') //-- Test ------------------------------------------------------------------------------ alias('test-junit').to('junit:junit:4.13.2')