From a6fb21485214cfb50e160614370f3d900803faa4 Mon Sep 17 00:00:00 2001 From: andrekir Date: Mon, 28 Mar 2022 09:11:06 -0300 Subject: [PATCH] remove isAlwaysPowered --- .../main/java/com/geeksville/mesh/model/UIState.kt | 12 ------------ .../geeksville/mesh/ui/AdvancedSettingsFragment.kt | 9 --------- app/src/main/res/layout/advanced_settings.xml | 12 ------------ 3 files changed, 33 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt index 8925fc450..eb2cea96d 100644 --- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt +++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt @@ -20,7 +20,6 @@ import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.first import kotlinx.coroutines.launch import kotlinx.coroutines.withContext @@ -154,17 +153,6 @@ class UIViewModel @Inject constructor( } } - var isAlwaysPowered: Boolean? - get() = radioConfig.value?.preferences?.isAlwaysPowered - set(value) { - val config = radioConfig.value - if (value != null && config != null) { - val builder = config.toBuilder() - builder.preferencesBuilder.isAlwaysPowered = value - setRadioConfig(builder.build()) - } - } - var region: RadioConfigProtos.RegionCode get() = meshService?.region?.let { RadioConfigProtos.RegionCode.forNumber(it) } ?: RadioConfigProtos.RegionCode.Unset diff --git a/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt index cc9366a66..281d291b3 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt @@ -44,7 +44,6 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging { binding.positionBroadcastSwitch.isChecked = !model.locationShareDisabled binding.lsSleepView.isEnabled = model.isPowerSaving ?: false binding.lsSleepSwitch.isChecked = model.isPowerSaving ?: false - binding.isAlwaysPoweredSwitch.isChecked = model.isAlwaysPowered ?: false } model.isConnected.observe(viewLifecycleOwner) { connectionState -> @@ -53,7 +52,6 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging { binding.lsSleepView.isEnabled = connected && model.isPowerSaving ?: false binding.positionBroadcastSwitch.isEnabled = connected binding.lsSleepSwitch.isEnabled = connected - binding.isAlwaysPoweredSwitch.isEnabled = connected } binding.positionBroadcastPeriodEditText.on(EditorInfo.IME_ACTION_DONE) { @@ -108,12 +106,5 @@ class AdvancedSettingsFragment : ScreenFragment("Advanced Settings"), Logging { debug("User changed isPowerSaving to $isChecked") } } - - binding.isAlwaysPoweredSwitch.setOnCheckedChangeListener { view, isChecked -> - if (view.isPressed) { - model.isAlwaysPowered = isChecked - debug("User changed isAlwaysPowered to $isChecked") - } - } } } \ No newline at end of file diff --git a/app/src/main/res/layout/advanced_settings.xml b/app/src/main/res/layout/advanced_settings.xml index 26ae6948e..79f1dfe82 100644 --- a/app/src/main/res/layout/advanced_settings.xml +++ b/app/src/main/res/layout/advanced_settings.xml @@ -65,16 +65,4 @@ app:layout_constraintBottom_toBottomOf="@id/lsSleepView" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="@id/lsSleepView" /> - - - \ No newline at end of file