aljaz/Android-nRF-Toolbox
1
0
Fork 0
mirror of https://github.com/aljazceru/Android-nRF-Toolbox.git synced 2026-01-25 17:44:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix new Toolbar

Browse Source
This commit is contained in:
Sylwester Zieliński
2022-05-11 14:43:57 +02:00
parent f0257c2d3f
commit edcc5bf6bc
18 changed files with 38 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
profile_csc/src/main/java/no/nordicsemi/android/csc/repository/CSCRepository.kt
View File

@@ -14,6 +14,7 @@ import no.nordicsemi.android.logger.ToolboxLogger
import no.nordicsemi.android.logger.ToolboxLoggerFactory
import no.nordicsemi.android.service.BleManagerResult
import no.nordicsemi.android.service.ConnectingResult
import no.nordicsemi.android.service.IdleResult
import no.nordicsemi.android.service.ServiceManager
import no.nordicsemi.ui.scanner.DiscoveredBluetoothDevice
import javax.inject.Inject
@@ -29,7 +30,7 @@ class CSCRepository @Inject constructor(
private var manager: CSCManager? = null
private var logger: ToolboxLogger? = null
private val _data = MutableStateFlow<BleManagerResult<CSCData>>(ConnectingResult())
private val _data = MutableStateFlow<BleManagerResult<CSCData>>(IdleResult())
internal val data = _data.asStateFlow()
val isRunning = data.map { it.isRunning() }

2
profile_csc/src/main/java/no/nordicsemi/android/csc/view/CSCScreen.kt
View File

@@ -50,7 +50,7 @@ fun CSCScreen() {
@Composable
private fun AppBar(state: CSCViewState, navigateUp: () -> Unit, viewModel: CSCViewModel) {
val toolbarName = (state.cscManagerState as? WorkingState)?.let {
(it.result as? SuccessResult<CSCData>)?.deviceName()
(it.result as? DeviceHolder)?.deviceName()
}
if (toolbarName == null) {