aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2025-12-21 16:34:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove DFU from Toolbox, because it will be in separate application.

Browse Source
This commit is contained in:
Sylwester Zieliński
2022-01-14 09:37:04 +01:00
parent 27e71dc0a3
commit ab19c8b877
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -62,7 +62,7 @@ dependencies {
implementation project(':profile_rscs') implementation project(':profile_rscs')
implementation project(':profile_uart') implementation project(':profile_uart')
implementation project(':profile_dfu') // implementation project(':profile_dfu')
implementation project(":lib_theme") implementation project(":lib_theme")
implementation project(":lib_utils") implementation project(":lib_utils")

6
app/src/main/java/no/nordicsemi/android/nrftoolbox/HomeScreen.kt
View File

@@ -30,7 +30,6 @@ import no.nordicsemi.android.prx.view.PRXScreen
import no.nordicsemi.android.rscs.view.RSCSScreen import no.nordicsemi.android.rscs.view.RSCSScreen
import no.nordicsemi.android.theme.view.CloseIconAppBar import no.nordicsemi.android.theme.view.CloseIconAppBar
import no.nordicsemi.android.uart.view.UARTScreen import no.nordicsemi.android.uart.view.UARTScreen
import no.nordicsemi.dfu.view.DFUScreen
import no.nordicsemi.ui.scanner.navigation.view.FindDeviceScreen import no.nordicsemi.ui.scanner.navigation.view.FindDeviceScreen
@Composable @Composable
@@ -119,7 +118,6 @@ internal fun HomeScreen() {
composable(NavDestination.DFU.id) { composable(NavDestination.DFU.id) {
FindDeviceScreen(ParcelUuid(NavDestination.DFU.uuid)) { FindDeviceScreen(ParcelUuid(NavDestination.DFU.uuid)) {
deviceHolder.onDeviceSelected(it) deviceHolder.onDeviceSelected(it)
DFUScreen { goHome() }
} }
} }
} }
@@ -284,8 +282,8 @@ fun HomeView(callback: (NavDestination) -> Unit) {
) { ) {
FeatureButton( FeatureButton(
R.drawable.ic_dfu, R.string.dfu_module, R.drawable.ic_dfu, R.string.dfu_module,
R.string.uart_module_full R.string.dfu_module_full
) { callback(NavDestination.DFU) } ) { }
} }
} }

2
app/src/main/res/values/strings.xml
View File

@@ -18,5 +18,5 @@
<string name="uart_module">UART</string> <string name="uart_module">UART</string>
<string name="uart_module_full">Serial port over BLE</string> <string name="uart_module_full">Serial port over BLE</string>
<string name="dfu_module">DFU</string> <string name="dfu_module">DFU</string>
<string name="dfu_module_full">Device Firmware Update</string> <string name="dfu_module_full">DFU is now available in separate application.</string>
</resources> </resources>