mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-16 12:59:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #399 from meshtastic/is_always_powered

Browse Source 
remove isAlwaysPowered
This commit is contained in:
Andre Kirchhoff
2022-03-28 09:13:11 -03:00
committed by GitHub
parent 0fdc47fbb9 a6fb214852
commit 1abfc77112
3 changed files with 0 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View File

@@ -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

9
app/src/main/java/com/geeksville/mesh/ui/AdvancedSettingsFragment.kt
View File

@@ -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")
}
}
}
}

12
app/src/main/res/layout/advanced_settings.xml
View File

@@ -65,16 +65,4 @@
app:layout_constraintBottom_toBottomOf="@id/lsSleepView"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/lsSleepView" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/isAlwaysPoweredSwitch"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:text="is_always_powered"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/lsSleepView"
app:layout_constraintTop_toBottomOf="@+id/lsSleepView" />
</androidx.constraintlayout.widget.ConstraintLayout>