From 234857c4148f3dc346a9a158ab8b2c0f9e22f08a Mon Sep 17 00:00:00 2001 From: darken Date: Sun, 1 May 2022 16:42:17 +0200 Subject: [PATCH] When enabling unfiltered BLE data, also enable "show all" to make debugging easier. --- .../general/debug/DebugSettingsFragment.kt | 1 + .../general/debug/DebugSettingsFragmentVM.kt | 19 +++++++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt index 4576ac1c..cf031694 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragment.kt @@ -34,6 +34,7 @@ class DebugSettingsFragment : PreferenceFragment2() { vm.toggleRecorder() true } + super.onViewCreated(view, savedInstanceState) } diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt index caa11be5..b2b77010 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/general/debug/DebugSettingsFragmentVM.kt @@ -3,10 +3,15 @@ package eu.darken.capod.main.ui.settings.general.debug import androidx.lifecycle.SavedStateHandle import dagger.hilt.android.lifecycle.HiltViewModel import eu.darken.capod.common.coroutine.DispatcherProvider +import eu.darken.capod.common.debug.autoreport.DebugSettings +import eu.darken.capod.common.debug.logging.log import eu.darken.capod.common.debug.logging.logTag import eu.darken.capod.common.debug.recording.core.RecorderModule import eu.darken.capod.common.uix.ViewModel3 +import eu.darken.capod.main.core.GeneralSettings +import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.onEach import javax.inject.Inject @HiltViewModel @@ -14,10 +19,24 @@ class DebugSettingsFragmentVM @Inject constructor( private val handle: SavedStateHandle, dispatcherProvider: DispatcherProvider, private val recorderModule: RecorderModule, + private val generalSettings: GeneralSettings, + private val debugSettings: DebugSettings, ) : ViewModel3(dispatcherProvider) { val state = recorderModule.state.asLiveData2() + init { + debugSettings.showUnfiltered.flow + .distinctUntilChanged() + .onEach { showUnfiltered -> + if (showUnfiltered) { + log(TAG) { "Enabling 'show all' due to debug setting 'show unfiltered' enabled" } + generalSettings.showAll.value = true + } + } + .launchInViewModel() + } + fun toggleRecorder() = launch { if (recorderModule.state.first().isRecording) { recorderModule.stopRecorder()