meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

update initCommonUI

Browse source
This commit is contained in:
andrekir 2022-01-08 16:30:06 -03:00
parent bc57946aec
commit d0614c7934
2 changed files with 29 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

70
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View file

@ -627,6 +627,20 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
updateNodeInfo()
})
scanModel.errorText.observe(viewLifecycleOwner, Observer { errMsg ->
if (errMsg != null) {
binding.scanStatusText.text = errMsg
}
})
scanModel.devices.observe(
viewLifecycleOwner,
Observer { devices -> updateDevicesButtons(devices) })
model.isConnected.observe(
viewLifecycleOwner,
{ updateDevicesButtons(scanModel.devices.value) })
binding.updateFirmwareButton.setOnClickListener {
doFirmwareUpdate()
}
@ -727,12 +741,6 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
}
}
/// Show the GUI for classic scanning
private fun showClassicWidgets(visible: Int) {
binding.scanProgressBar.visibility = visible
binding.deviceRadioGroup.visibility = visible
}
private fun updateDevicesButtons(devices: MutableMap<String, BTScanModel.DeviceListEntry>?) {
// Remove the old radio buttons and repopulate
binding.deviceRadioGroup.removeAllViews()
@ -790,42 +798,6 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
View.GONE
else
View.VISIBLE
}
/// Setup the GUI to do a classic (pre SDK 26 BLE scan)
private fun initClassicScan() {
// Turn off the widgets for the new API (we turn on/off hte classic widgets when we start scanning
binding.changeRadioButton.visibility = View.GONE
showClassicWidgets(View.VISIBLE)
model.bluetoothEnabled.observe(viewLifecycleOwner, Observer { enabled ->
if (enabled)
scanModel.startScan()
else
scanModel.stopScan()
})
scanModel.errorText.observe(viewLifecycleOwner, Observer { errMsg ->
if (errMsg != null) {
binding.scanStatusText.text = errMsg
}
})
scanModel.devices.observe(
viewLifecycleOwner,
Observer { devices -> updateDevicesButtons(devices) })
model.isConnected.observe(
viewLifecycleOwner,
{ updateDevicesButtons(scanModel.devices.value) })
}
private fun initModernScan() {
// Turn off the widgets for the classic API
binding.scanProgressBar.visibility = View.GONE
binding.deviceRadioGroup.visibility = View.GONE
binding.changeRadioButton.visibility = View.VISIBLE
val curRadio = RadioInterfaceService.getBondedDeviceAddress(requireContext())
@ -834,6 +806,20 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
} else {
binding.scanStatusText.text = getString(R.string.not_paired_yet)
}
}
private fun initClassicScan() {
model.bluetoothEnabled.observe(viewLifecycleOwner, Observer { enabled ->
if (enabled)
scanModel.startScan()
else
scanModel.stopScan()
})
}
private fun initModernScan() {
binding.changeRadioButton.setOnClickListener {
myActivity.startCompanionScan()
}

1
app/src/main/res/layout/settings_fragment.xml
View file

@ -85,6 +85,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/deviceRadioGroup" />