From ab19c8b877522ea42b1d0d7660c2d91e7d928acf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sylwester=20Zieli=C5=84ski?= Date: Fri, 14 Jan 2022 09:37:04 +0100 Subject: [PATCH] Remove DFU from Toolbox, because it will be in separate application. --- app/build.gradle | 2 +- .../java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt | 6 ++---- app/src/main/res/values/strings.xml | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 071f7180..10444470 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ dependencies { implementation project(':profile_rscs') implementation project(':profile_uart') - implementation project(':profile_dfu') +// implementation project(':profile_dfu') implementation project(":lib_theme") implementation project(":lib_utils") 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 b9b1af44..ab491846 100644 --- a/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt +++ b/app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt @@ -30,7 +30,6 @@ import no.nordicsemi.android.prx.view.PRXScreen import no.nordicsemi.android.rscs.view.RSCSScreen import no.nordicsemi.android.theme.view.CloseIconAppBar import no.nordicsemi.android.uart.view.UARTScreen -import no.nordicsemi.dfu.view.DFUScreen import no.nordicsemi.ui.scanner.navigation.view.FindDeviceScreen @Composable @@ -119,7 +118,6 @@ internal fun HomeScreen() { composable(NavDestination.DFU.id) { FindDeviceScreen(ParcelUuid(NavDestination.DFU.uuid)) { deviceHolder.onDeviceSelected(it) - DFUScreen { goHome() } } } } @@ -284,8 +282,8 @@ fun HomeView(callback: (NavDestination) -> Unit) { ) { FeatureButton( R.drawable.ic_dfu, R.string.dfu_module, - R.string.uart_module_full - ) { callback(NavDestination.DFU) } + R.string.dfu_module_full + ) { } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d252a993..65139ad1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,5 +18,5 @@ UART Serial port over BLE DFU - Device Firmware Update + DFU is now available in separate application.